projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d96f27c
)
ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
author
Dinghao Liu
<dinghao.liu@zju.edu.cn>
Thu, 13 Aug 2020 07:46:30 +0000
(15:46 +0800)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 13 Aug 2020 09:21:05 +0000
(11:21 +0200)
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:
47b5d028fdce8
("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>
sound/pci/echoaudio/echoaudio.c
patch
|
blob
|
history
diff --git
a/sound/pci/echoaudio/echoaudio.c
b/sound/pci/echoaudio/echoaudio.c
index
1b7a67c
..
a20b2bb
100644
(file)
--- a/
sound/pci/echoaudio/echoaudio.c
+++ b/
sound/pci/echoaudio/echoaudio.c
@@
-2212,7
+2212,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;
}
@@
-2239,7
+2238,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;