From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: yu kuai <yukuai3@huawei.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Sasha Levin <sashal@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.4 23/40] ARM: at91: pm: add missing put_device() call in at91_pm_sram_init()
Date: Sat, 8 Aug 2020 19:38:27 -0400 [thread overview]
Message-ID: <20200808233844.3618823-23-sashal@kernel.org> (raw)
In-Reply-To: <20200808233844.3618823-1-sashal@kernel.org>
From: yu kuai <yukuai3@huawei.com>
[ Upstream commit f87a4f022c44e5b87e842a9f3e644fba87e8385f ]
if of_find_device_by_node() succeed, at91_pm_sram_init() doesn't have
a corresponding put_device(). Thus add a jump target to fix the exception
handling for this function implementation.
Fixes: d2e467905596 ("ARM: at91: pm: use the mmio-sram pool to access SRAM")
Signed-off-by: yu kuai <yukuai3@huawei.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200604123301.3905837-1-yukuai3@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/mach-at91/pm.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 52665f30d236d..6bc3000deb86e 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void)
sram_pool = gen_pool_get(&pdev->dev, NULL);
if (!sram_pool) {
pr_warn("%s: sram pool unavailable!\n", __func__);
- return;
+ goto out_put_device;
}
sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);
if (!sram_base) {
pr_warn("%s: unable to alloc sram!\n", __func__);
- return;
+ goto out_put_device;
}
sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
@@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void)
at91_pm_suspend_in_sram_sz, false);
if (!at91_suspend_sram_fn) {
pr_warn("SRAM: Could not map\n");
- return;
+ goto out_put_device;
}
/* Copy the pm suspend handler to SRAM */
at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,
&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
+ return;
+
+out_put_device:
+ put_device(&pdev->dev);
+ return;
}
static bool __init at91_is_pm_mode_active(int pm_mode)
--
2.25.1
next prev parent reply other threads:[~2020-08-08 23:43 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-08 23:38 [PATCH AUTOSEL 5.4 01/40] x86/mce/inject: Fix a wrong assignment of i_mce.status Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 02/40] sched/fair: Fix NOHZ next idle balance Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 03/40] sched: correct SD_flags returned by tl->sd_flags() Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 04/40] arm64: dts: rockchip: fix rk3368-lion gmac reset gpio Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 05/40] arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 06/40] arm64: dts: rockchip: fix rk3399-puma gmac reset gpio Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 07/40] EDAC: Fix reference count leaks Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 08/40] crc-t10dif: Fix potential crypto notify dead-lock Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 09/40] arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 10/40] blktrace: fix debugfs use after free Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 11/40] crypto: ccree - fix resource leak on error path Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 12/40] ARM: exynos: MCPM: Restore big.LITTLE cpuidle support Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 13/40] firmware: arm_scmi: Fix SCMI genpd domain probing Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 14/40] arm64: dts: exynos: Fix silent hang after boot on Espresso Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 15/40] sched/uclamp: Fix initialization of struct uclamp_rq Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 16/40] clk: scmi: Fix min and max rate when registering clocks with discrete rates Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 17/40] m68k: mac: Don't send IOP message until channel is idle Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 18/40] m68k: mac: Fix IOP status/control register writes Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 19/40] platform/x86: intel-hid: Fix return value check in check_acpi_dev() Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 20/40] platform/x86: intel-vbtn: " Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 21/40] ARM: dts: gose: Fix ports node name for adv7180 Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 22/40] ARM: dts: gose: Fix ports node name for adv7612 Sasha Levin
2020-08-08 23:38 ` Sasha Levin [this message]
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 24/40] ARM: dts: sunxi: bananapi-m2-plus-v1.2: Add regulator supply to all CPU cores Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 25/40] ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply voltages Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 26/40] spi: lantiq: fix: Rx overflow error in full duplex mode Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 27/40] tpm: Require that all digests are present in TCG_PCR_EVENT2 structures Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 28/40] recordmcount: only record relocation of type R_AARCH64_CALL26 on arm64 Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 29/40] regulator: fix memory leak on error path of regulator_register() Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 30/40] io_uring: fix sq array offset calculation Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 31/40] spi: rockchip: Fix error in SPI slave pio read Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 32/40] ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 33/40] iocost: Fix check condition of iocg abs_vdebt Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 34/40] irqchip/ti-sci-inta: Fix return value about devm_ioremap_resource() Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 35/40] seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 36/40] md: raid0/linear: fix dereference before null check on pointer mddev Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 37/40] nvme-tcp: fix controller reset hang during traffic Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 38/40] nvme-rdma: " Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 39/40] nvme-multipath: fix logic for non-optimized paths Sasha Levin
2020-08-08 23:38 ` [PATCH AUTOSEL 5.4 40/40] nvme-multipath: do not fall back to __nvme_find_path() " Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200808233844.3618823-23-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=yukuai3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox