From patchwork Tue Jun 23 19:56:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 223464 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10634C433DF for ; Tue, 23 Jun 2020 20:30:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D67042070E for ; Tue, 23 Jun 2020 20:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944212; bh=Y3yARQh0T25+WI1hcfxzdNJCo/227p3KnHgtfLNc2bU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wICJIGsa6AM/cAJSxi/D5brAeN0eiIAhMl0FeQzwpmtqGbguru2fbgPtWFf8hFgH6 us+5qU80ZIV+CGHCBymoGQRvapRdjlU1Ox510gVdQ2SshOe/yKqTmLbC0f0GW3ETn7 NgoA1tqAIgp46k4p8BiZxKx69/4+dwGuiEIEehLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391104AbgFWUaK (ORCPT ); Tue, 23 Jun 2020 16:30:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:50372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390595AbgFWUaJ (ORCPT ); Tue, 23 Jun 2020 16:30:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09F1B206EB; Tue, 23 Jun 2020 20:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944209; bh=Y3yARQh0T25+WI1hcfxzdNJCo/227p3KnHgtfLNc2bU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aTuzbCfpOVJcHbtSgCcSOblddqYM+mi0vKKuAbVPkV+cn7L7PSe37h5cZnEsAU8rp bSkxzysd0ZGEjZ9Yubk0IzsOmngbEYQbU/yjeFTVuAwXNvQL/KO/0xfUqx878BJRAB AoknIIv5YSrFZrTqrrhLdxcWqzuTdUQVUXuciCyw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Linus Walleij , Sasha Levin Subject: [PATCH 5.4 215/314] pinctrl: imxl: Fix an error handling path in imx1_pinctrl_core_probe() Date: Tue, 23 Jun 2020 21:56:50 +0200 Message-Id: <20200623195349.182363330@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET [ Upstream commit 9eb728321286c4b31e964d2377fca2368526d408 ] When 'pinctrl_register()' has been turned into 'devm_pinctrl_register()', an error handling path has not been updated. Axe a now unneeded 'pinctrl_unregister()'. Fixes: e55e025d1687 ("pinctrl: imxl: Use devm_pinctrl_register() for pinctrl registration") Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/20200530201952.585798-1-christophe.jaillet@wanadoo.fr Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c index 7e29e3fecdb24..5bb183c0ce310 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c @@ -638,7 +638,6 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); if (ret) { - pinctrl_unregister(ipctl->pctl); dev_err(&pdev->dev, "Failed to populate subdevices\n"); return ret; }