diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-09-22 14:38:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:03 -0700 |
| commit | f9db06c630f31bc26d4946151aa8db5aa4155c96 (patch) | |
| tree | c56910fd567d61956c6db8a7309345180ac58179 /sound/pci | |
| parent | b5fa99b753a2b03aeb9ce2851ac038855258e847 (diff) | |
| download | kernel_samsung_espresso10-f9db06c630f31bc26d4946151aa8db5aa4155c96.zip kernel_samsung_espresso10-f9db06c630f31bc26d4946151aa8db5aa4155c96.tar.gz kernel_samsung_espresso10-f9db06c630f31bc26d4946151aa8db5aa4155c96.tar.bz2 | |
ALSA: fm801: Fix double free in case of error in tuner detection
commit 2ba34e43ba0469086d1ff81c13a9aa9070c1a0e1 upstream.
Commit 9676001559fce06e37c7dc230ab275f605556176
("ALSA: fm801: add error handling if auto-detect fails") added
incorrect error handling.
Once we have successfully called snd_device_new(), the cleanup
function fm801_free() will automatically be called by snd_card_free()
and we must *not* also call fm801_free() directly.
Reported-by: Hor Jiun Shyong <jiunshyong@gmail.com>
References: http://bugs.debian.org/641946
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/fm801.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index a7ec703..0dd8963 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1236,7 +1236,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, (tea575x_tuner & TUNER_TYPE_MASK) < 4) { if (snd_tea575x_init(&chip->tea)) { snd_printk(KERN_ERR "TEA575x radio not found\n"); - snd_fm801_free(chip); return -ENODEV; } } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) { @@ -1251,7 +1250,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, } if (tea575x_tuner == 4) { snd_printk(KERN_ERR "TEA575x radio not found\n"); - snd_fm801_free(chip); return -ENODEV; } } |