diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 14:36:18 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 13:14:26 -0800 |
commit | aaf238baf31e14cb1c111815193c3a78770b1873 (patch) | |
tree | 36c89b47364c470c7cbafbade2220d5c68a4ccc2 /sound/core/sound.c | |
parent | 919609d3cba52431b16501a63e6a5d45266a25c6 (diff) | |
download | kernel_samsung_smdk4412-aaf238baf31e14cb1c111815193c3a78770b1873.zip kernel_samsung_smdk4412-aaf238baf31e14cb1c111815193c3a78770b1873.tar.gz kernel_samsung_smdk4412-aaf238baf31e14cb1c111815193c3a78770b1873.tar.bz2 |
ALSA: Fix card refcount unbalance
commit 8bb4d9ce08b0a92ca174e41d92c180328f86173f upstream.
There are uncovered cases whether the card refcount introduced by the
commit a0830dbd isn't properly increased or decreased:
- OSS PCM and mixer success paths
- When lookup function gets NULL
This patch fixes these places.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50251
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core/sound.c')
-rw-r--r-- | sound/core/sound.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index b235aaa..e9b79b5 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -115,7 +115,7 @@ void *snd_lookup_minor_data(unsigned int minor, int type) mreg = snd_minors[minor]; if (mreg && mreg->type == type) { private_data = mreg->private_data; - if (mreg->card_ptr) + if (private_data && mreg->card_ptr) atomic_inc(&mreg->card_ptr->refcount); } else private_data = NULL; |