Merge branch 'for-next' into for-linus

[linux-2.6-microblaze.git] / sound / core / jack.c

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 537df1e..d1e3055 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -62,10 +62,13 @@ static int snd_jack_dev_free(struct snd_device *device)
        struct snd_card *card = device->card;
        struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl;
 
+       down_write(&card->controls_rwsem);
        list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) {
                list_del_init(&jack_kctl->list);
                snd_ctl_remove(card, jack_kctl->kctl);
        }
+       up_write(&card->controls_rwsem);
+
        if (jack->private_free)
                jack->private_free(jack);