Merge branch 'for-next' into for-linus

[linux-2.6-block.git] / sound / core / control.c

diff --git a/sound/core/control.c b/sound/core/control.c
index 9ff081cd03f4896e9a510604383ec87179a97b8a..fb096cb20a80d1fb47c351154529177df064eb9d 100644 (file)
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -160,6 +160,8 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask,
        
        if (snd_BUG_ON(!card || !id))
                return;
+       if (card->shutdown)
+               return;
        read_lock(&card->ctl_files_rwlock);
 #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
        card->mixer_oss_change_count++;