diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-23 17:00:25 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-24 10:19:07 +0000 |
commit | 952671071125edd74e401656820e52b3f87db446 (patch) | |
tree | 90c730441e7a6c328715fe35a9c5354b99d3d203 /sound | |
parent | b66890eae17a10b50a94472de6ed095ff8ebd315 (diff) | |
parent | 77fcb48939fc863d9ba9d808fac9000959e937d3 (diff) |
Merge tag 'v5.4.60' into 5.4-2.1.x-imx
This is the 5.4.60 stable release
Conflicts (manual resolve):
- drivers/crypto/caam/caamalg.c
Keep NXP version, as it already covers the functionality for the
upstream patch [d6bbd4eea2439]
- drivers/gpu/drm/imx/imx-ldb.c
Merge patch [1752ab50e8256] from upstream to disable both LVDS channels
when Enoder is disabled
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index ca9125726be2..8596ae4c2bde 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2198,7 +2198,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; } @@ -2225,7 +2224,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; |