summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLin Yujun <linyujun809@huawei.com>2022-09-14 11:30:18 +0800
committerDaniel Lezcano <daniel.lezcano@linaro.org>2022-09-20 10:49:45 +0200
commit0e2c8e6d769bcdc4f6634a02c545356282275e68 (patch)
treea12de5d0c68beb96b6a2057b9954c227f36b4796
parent6c3b62d93e195f78c1437c8fa7581e9b2f00886e (diff)
downloadlinux-stable-0e2c8e6d769bcdc4f6634a02c545356282275e68.tar.gz
linux-stable-0e2c8e6d769bcdc4f6634a02c545356282275e68.tar.bz2
linux-stable-0e2c8e6d769bcdc4f6634a02c545356282275e68.zip
clocksource/drivers/timer-gxp: Add missing error handling in gxp_timer_probe
Add platform_device_put() to make sure to free the platform device in the event platform_device_add() fails. Fixes: 5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer") Signed-off-by: Lin Yujun <linyujun809@huawei.com> Link: https://lore.kernel.org/r/20220914033018.97484-1-linyujun809@huawei.com Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/timer-gxp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-gxp.c b/drivers/clocksource/timer-gxp.c
index 8b38b3212388..fe4fa8d7b3f1 100644
--- a/drivers/clocksource/timer-gxp.c
+++ b/drivers/clocksource/timer-gxp.c
@@ -171,6 +171,7 @@ static int gxp_timer_probe(struct platform_device *pdev)
{
struct platform_device *gxp_watchdog_device;
struct device *dev = &pdev->dev;
+ int ret;
if (!gxp_timer) {
pr_err("Gxp Timer not initialized, cannot create watchdog");
@@ -187,7 +188,11 @@ static int gxp_timer_probe(struct platform_device *pdev)
gxp_watchdog_device->dev.platform_data = gxp_timer->counter;
gxp_watchdog_device->dev.parent = dev;
- return platform_device_add(gxp_watchdog_device);
+ ret = platform_device_add(gxp_watchdog_device);
+ if (ret)
+ platform_device_put(gxp_watchdog_device);
+
+ return ret;
}
static const struct of_device_id gxp_timer_of_match[] = {