From 77c64c91013f0eb2bc03423e8dddc16ece84d629 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 18 Sep 2022 19:55:45 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...add-missing-iounmap-in-error-path-in.patch | 35 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-5.4/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch diff --git a/queue-5.4/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch b/queue-5.4/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch new file mode 100644 index 00000000000..c8e145d567e --- /dev/null +++ b/queue-5.4/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch @@ -0,0 +1,35 @@ +From f431714aa38b2383b3e36e82db1bf9035bd32535 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Aug 2022 17:36:57 +0800 +Subject: parisc: ccio-dma: Add missing iounmap in error path in ccio_probe() + +From: Yang Yingliang + +[ Upstream commit 38238be4e881a5d0abbe4872b4cd6ed790be06c8 ] + +Add missing iounmap() before return from ccio_probe(), if ccio_init_resources() +fails. + +Fixes: d46c742f827f ("parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()") +Signed-off-by: Yang Yingliang +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/parisc/ccio-dma.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c +index 6209d58e9492..fdd302d0a1c9 100644 +--- a/drivers/parisc/ccio-dma.c ++++ b/drivers/parisc/ccio-dma.c +@@ -1544,6 +1544,7 @@ static int __init ccio_probe(struct parisc_device *dev) + } + ccio_ioc_init(ioc); + if (ccio_init_resources(ioc)) { ++ iounmap(ioc->ioc_regs); + kfree(ioc); + return -ENOMEM; + } +-- +2.35.1 + diff --git a/queue-5.4/series b/queue-5.4/series index adc182106bd..353e5d10f4f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -17,3 +17,4 @@ nfsv4-turn-off-open-by-filehandle-and-nfs-re-export-.patch gpio-mpc8xxx-fix-support-for-irq_type_level_low-flow.patch drm-meson-correct-osd1-global-alpha-value.patch drm-meson-fix-osd1-rgb-to-ycbcr-coefficient.patch +parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch -- 2.47.3