diff options
Diffstat (limited to 'sound/synth/emux/soundfont.c')
-rw-r--r-- | sound/synth/emux/soundfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 4c5754d4a2e8..32c27162dfb6 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
@@ -79,7 +79,7 @@ static void | |||
79 | lock_preset(struct snd_sf_list *sflist) | 79 | lock_preset(struct snd_sf_list *sflist) |
80 | { | 80 | { |
81 | unsigned long flags; | 81 | unsigned long flags; |
82 | down(&sflist->presets_mutex); | 82 | mutex_lock(&sflist->presets_mutex); |
83 | spin_lock_irqsave(&sflist->lock, flags); | 83 | spin_lock_irqsave(&sflist->lock, flags); |
84 | sflist->presets_locked = 1; | 84 | sflist->presets_locked = 1; |
85 | spin_unlock_irqrestore(&sflist->lock, flags); | 85 | spin_unlock_irqrestore(&sflist->lock, flags); |
@@ -96,7 +96,7 @@ unlock_preset(struct snd_sf_list *sflist) | |||
96 | spin_lock_irqsave(&sflist->lock, flags); | 96 | spin_lock_irqsave(&sflist->lock, flags); |
97 | sflist->presets_locked = 0; | 97 | sflist->presets_locked = 0; |
98 | spin_unlock_irqrestore(&sflist->lock, flags); | 98 | spin_unlock_irqrestore(&sflist->lock, flags); |
99 | up(&sflist->presets_mutex); | 99 | mutex_unlock(&sflist->presets_mutex); |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
@@ -1390,7 +1390,7 @@ snd_sf_new(struct snd_sf_callback *callback, struct snd_util_memhdr *hdr) | |||
1390 | if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL) | 1390 | if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL) |
1391 | return NULL; | 1391 | return NULL; |
1392 | 1392 | ||
1393 | init_MUTEX(&sflist->presets_mutex); | 1393 | mutex_init(&sflist->presets_mutex); |
1394 | spin_lock_init(&sflist->lock); | 1394 | spin_lock_init(&sflist->lock); |
1395 | sflist->memhdr = hdr; | 1395 | sflist->memhdr = hdr; |
1396 | 1396 | ||