diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-09-22 14:38:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 15:51:46 +0200 |
| commit | 2ba34e43ba0469086d1ff81c13a9aa9070c1a0e1 (patch) | |
| tree | 3392535e3ee4970c4dac01784b07c9e0cfe5cf5d /sound | |
| parent | 46724c2e023cb7ba5cd5000dee6481f0a15ebed9 (diff) | |
| download | lwn-2ba34e43ba0469086d1ff81c13a9aa9070c1a0e1.tar.gz lwn-2ba34e43ba0469086d1ff81c13a9aa9070c1a0e1.zip | |
ALSA: fm801: Fix double free in case of error in tuner detection
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>
Cc: stable@kernel.org [v3.0+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -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 f9123f09e83e..a96456daf393 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; } } |