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
/
isa
/
ad1848
/
ad1848_lib.c
diff --git
a/sound/isa/ad1848/ad1848_lib.c
b/sound/isa/ad1848/ad1848_lib.c
index
e0f8baa
..
ed7cdb0
100644
(file)
--- a/
sound/isa/ad1848/ad1848_lib.c
+++ b/
sound/isa/ad1848/ad1848_lib.c
@@
-387,9
+387,9
@@
static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
{
unsigned long flags;
{
unsigned long flags;
-
mutex_lock
(&chip->open_mutex);
+
down
(&chip->open_mutex);
if (chip->mode & AD1848_MODE_OPEN) {
if (chip->mode & AD1848_MODE_OPEN) {
-
mutex_unlock
(&chip->open_mutex);
+
up
(&chip->open_mutex);
return -EAGAIN;
}
snd_ad1848_mce_down(chip);
return -EAGAIN;
}
snd_ad1848_mce_down(chip);
@@
-432,7
+432,7
@@
static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
spin_unlock_irqrestore(&chip->reg_lock, flags);
chip->mode = mode;
spin_unlock_irqrestore(&chip->reg_lock, flags);
chip->mode = mode;
-
mutex_unlock
(&chip->open_mutex);
+
up
(&chip->open_mutex);
return 0;
}
return 0;
}
@@
-441,9
+441,9
@@
static void snd_ad1848_close(struct snd_ad1848 *chip)
{
unsigned long flags;
{
unsigned long flags;
-
mutex_lock
(&chip->open_mutex);
+
down
(&chip->open_mutex);
if (!chip->mode) {
if (!chip->mode) {
-
mutex_unlock
(&chip->open_mutex);
+
up
(&chip->open_mutex);
return;
}
/* disable IRQ */
return;
}
/* disable IRQ */
@@
-471,7
+471,7
@@
static void snd_ad1848_close(struct snd_ad1848 *chip)
spin_unlock_irqrestore(&chip->reg_lock, flags);
chip->mode = 0;
spin_unlock_irqrestore(&chip->reg_lock, flags);
chip->mode = 0;
-
mutex_unlock
(&chip->open_mutex);
+
up
(&chip->open_mutex);
}
/*
}
/*
@@
-889,7
+889,7
@@
int snd_ad1848_create(struct snd_card *card,
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->reg_lock);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->reg_lock);
-
mutex_init
(&chip->open_mutex);
+
init_MUTEX
(&chip->open_mutex);
chip->card = card;
chip->port = port;
chip->irq = -1;
chip->card = card;
chip->port = port;
chip->irq = -1;