Commit 2ba34e43 authored by Ben Hutchings's avatar Ben Hutchings Committed by Takashi Iwai

ALSA: fm801: Fix double free in case of error in tuner detection

Commit 96760015
("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: default avatarHor Jiun Shyong <jiunshyong@gmail.com>
References: http://bugs.debian.org/641946Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: stable@kernel.org [v3.0+]
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 46724c2e
...@@ -1236,7 +1236,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, ...@@ -1236,7 +1236,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
(tea575x_tuner & TUNER_TYPE_MASK) < 4) { (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
if (snd_tea575x_init(&chip->tea)) { if (snd_tea575x_init(&chip->tea)) {
snd_printk(KERN_ERR "TEA575x radio not found\n"); snd_printk(KERN_ERR "TEA575x radio not found\n");
snd_fm801_free(chip);
return -ENODEV; return -ENODEV;
} }
} else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) { } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) {
...@@ -1251,7 +1250,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, ...@@ -1251,7 +1250,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
} }
if (tea575x_tuner == 4) { if (tea575x_tuner == 4) {
snd_printk(KERN_ERR "TEA575x radio not found\n"); snd_printk(KERN_ERR "TEA575x radio not found\n");
snd_fm801_free(chip);
return -ENODEV; return -ENODEV;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment