diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-08 08:05:19 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-07 21:45:07 -0400 |
| commit | 77dee6b71989b05fa3bcbcc360e26bb7928098cb (patch) | |
| tree | 47911c6d97f3dcb68cfe3b0e1d7f8eab688a0b93 /sound | |
| parent | ee5dc42072afe16b45972667c58c373876803f3c (diff) | |
| download | linux-rt-77dee6b71989b05fa3bcbcc360e26bb7928098cb.tar.gz | |
ALSA: ctl: Stop notification after disconnection
[ Upstream commit f388cdcdd160687c6650833f286b9c89c50960ff ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
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 82a638a01b24..733b803af271 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -150,6 +150,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++; |