diff options
Diffstat (limited to 'sound/arm/aaci.c')
-rw-r--r-- | sound/arm/aaci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 149feb410654..5f22d70fefc0 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -73,7 +73,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned | |||
73 | if (ac97->num >= 4) | 73 | if (ac97->num >= 4) |
74 | return; | 74 | return; |
75 | 75 | ||
76 | down(&aaci->ac97_sem); | 76 | mutex_lock(&aaci->ac97_sem); |
77 | 77 | ||
78 | aaci_ac97_select_codec(aaci, ac97); | 78 | aaci_ac97_select_codec(aaci, ac97); |
79 | 79 | ||
@@ -91,7 +91,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned | |||
91 | v = readl(aaci->base + AACI_SLFR); | 91 | v = readl(aaci->base + AACI_SLFR); |
92 | } while (v & (SLFR_1TXB|SLFR_2TXB)); | 92 | } while (v & (SLFR_1TXB|SLFR_2TXB)); |
93 | 93 | ||
94 | up(&aaci->ac97_sem); | 94 | mutex_unlock(&aaci->ac97_sem); |
95 | } | 95 | } |
96 | 96 | ||
97 | /* | 97 | /* |
@@ -105,7 +105,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg) | |||
105 | if (ac97->num >= 4) | 105 | if (ac97->num >= 4) |
106 | return ~0; | 106 | return ~0; |
107 | 107 | ||
108 | down(&aaci->ac97_sem); | 108 | mutex_lock(&aaci->ac97_sem); |
109 | 109 | ||
110 | aaci_ac97_select_codec(aaci, ac97); | 110 | aaci_ac97_select_codec(aaci, ac97); |
111 | 111 | ||
@@ -145,7 +145,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg) | |||
145 | v = ~0; | 145 | v = ~0; |
146 | } | 146 | } |
147 | 147 | ||
148 | up(&aaci->ac97_sem); | 148 | mutex_unlock(&aaci->ac97_sem); |
149 | return v; | 149 | return v; |
150 | } | 150 | } |
151 | 151 | ||
@@ -783,7 +783,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) | |||
783 | card->shortname, dev->res.start, dev->irq[0]); | 783 | card->shortname, dev->res.start, dev->irq[0]); |
784 | 784 | ||
785 | aaci = card->private_data; | 785 | aaci = card->private_data; |
786 | init_MUTEX(&aaci->ac97_sem); | 786 | mutex_init(&aaci->ac97_sem); |
787 | spin_lock_init(&aaci->lock); | 787 | spin_lock_init(&aaci->lock); |
788 | aaci->card = card; | 788 | aaci->card = card; |
789 | aaci->dev = dev; | 789 | aaci->dev = dev; |