diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-08 08:05:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-08 09:15:44 +0200 |
| commit | f388cdcdd160687c6650833f286b9c89c50960ff (patch) | |
| tree | cbf0f3f2c7233225a19d274802d7de299d075125 /sound | |
| parent | 8a132099f080d7384bb6ab4cc168f76cb4b47d08 (diff) | |
| download | linux-f388cdcdd160687c6650833f286b9c89c50960ff.tar.bz2 | |
ALSA: ctl: Stop notification after disconnection
snd_ctl_remove() has a notification for the removal event. It's
superfluous when done during the device got disconnected. Although
the notification itself is mostly harmless, it may potentially be
harmful, and should be suppressed. Actually some components PCM may
free ctl elements during the disconnect or free callbacks, thus it's
no theoretical issue.
This patch adds the check of card->shutdown flag for avoiding
unnecessary notifications after (or during) the disconnect.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index a85d45595d02..b4fe9b002512 100644 --- 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++; |