git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
pci
/
cs46xx
/
dsp_spos_scb_lib.c
diff --git
a/sound/pci/cs46xx/dsp_spos_scb_lib.c
b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index
2c4ee45
..
d4e0fb3
100644
(file)
--- a/
sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/
sound/pci/cs46xx/dsp_spos_scb_lib.c
@@
-28,8
+28,6
@@
#include <linux/pm.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/pm.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <linux/mutex.h>
-
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>
@@
-79,7
+77,7
@@
static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
ins = chip->dsp_spos_instance;
ins = chip->dsp_spos_instance;
-
mutex_lock
(&chip->spos_mutex);
+
down
(&chip->spos_mutex);
snd_iprintf(buffer,"%04x %s:\n",scb->address,scb->scb_name);
for (col = 0,j = 0;j < 0x10; j++,col++) {
snd_iprintf(buffer,"%04x %s:\n",scb->address,scb->scb_name);
for (col = 0,j = 0;j < 0x10; j++,col++) {
@@
-107,7
+105,7
@@
static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
scb->task_entry->address);
snd_iprintf(buffer,"index [%d] ref_count [%d]\n",scb->index,scb->ref_count);
scb->task_entry->address);
snd_iprintf(buffer,"index [%d] ref_count [%d]\n",scb->index,scb->ref_count);
-
mutex_unlock
(&chip->spos_mutex);
+
up
(&chip->spos_mutex);
}
#endif
}
#endif