mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
[ Upstream commit5a25de6df7
] Freeing chip on error may lead to an Oops at the next time the system goes to resume. Fix this by removing all snd_echo_free() calls on error. Fixes:47b5d028fd
("ALSA: Echoaudio - Add suspend support #2") Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Link: https://lore.kernel.org/r/20200813074632.17022-1-dinghao.liu@zju.edu.cn Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d4c83f8e64
commit
8ef7978968
1 changed files with 0 additions and 2 deletions
|
@ -2215,7 +2215,6 @@ static int snd_echo_resume(struct device *dev)
|
|||
if (err < 0) {
|
||||
kfree(commpage_bak);
|
||||
dev_err(dev, "resume init_hw err=%d\n", err);
|
||||
snd_echo_free(chip);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -2242,7 +2241,6 @@ static int snd_echo_resume(struct device *dev)
|
|||
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
|
||||
KBUILD_MODNAME, chip)) {
|
||||
dev_err(chip->card->dev, "cannot grab irq\n");
|
||||
snd_echo_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
chip->irq = pci->irq;
|
||||
|
|
Loading…
Reference in a new issue