From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com ([209.85.221.52]:40229 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725953AbeKZHMv (ORCPT ); Mon, 26 Nov 2018 02:12:51 -0500 Received: by mail-wr1-f52.google.com with SMTP id p4so16803617wrt.7 for ; Sun, 25 Nov 2018 12:20:58 -0800 (PST) Date: Sun, 25 Nov 2018 20:20:55 +0000 From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Alexandre Belloni Subject: request for 4.14-stable: 26e480f7bb78 ("rtc: omap: fix error path when pinctrl_register fails") Message-ID: <20181125202055.475xc437zyshbpbs@debian> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="l6h3ylbwakzkq6yv" Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: --l6h3ylbwakzkq6yv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Greg, This was not marked for stable but seems it should be in stable. Please apply to your queue of 4.14-stable. -- Regards Sudip --l6h3ylbwakzkq6yv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-rtc-omap-fix-error-path-when-pinctrl_register-fails.patch" >>From 76032858c1b183522cf603a789de223e1ff0f239 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Fri, 13 Oct 2017 00:06:44 +0200 Subject: [PATCH] rtc: omap: fix error path when pinctrl_register fails commit 26e480f7bb7840fc0daa9c3af7c4501b2cf5902f upstream If pinctrl_register() fails probe will return with an error without locking the RTC and disabling pm_runtime. Set ret and jump to err instead. Fixes: 97ea1906b3c2 ("rtc: omap: Support ext_wakeup configuration") Signed-off-by: Alexandre Belloni Signed-off-by: Sudip Mukherjee --- drivers/rtc/rtc-omap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index ac6e6a6a194c..ae6506a8b4f5 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -823,7 +823,8 @@ static int omap_rtc_probe(struct platform_device *pdev) rtc->pctldev = pinctrl_register(&rtc_pinctrl_desc, &pdev->dev, rtc); if (IS_ERR(rtc->pctldev)) { dev_err(&pdev->dev, "Couldn't register pinctrl driver\n"); - return PTR_ERR(rtc->pctldev); + ret = PTR_ERR(rtc->pctldev); + goto err; } if (rtc->is_pmic_controller) { -- 2.11.0 --l6h3ylbwakzkq6yv--