From patchwork Thu Jan 27 21:50:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12727468 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D894FC433EF for ; Thu, 27 Jan 2022 21:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Vp72Vj8B6avOhNVsQ/0xavi2nMLEr13BEU8bBfKR+A8=; b=IFGUjgSqJAigQk P7KOUSt7FGgpA/BzwyWo7wJpVxIP8M+cqaMK2THFoJRpW5zmd6W2znb6Gw5qqazp6FgwHEzLBX/t3 4KX4a2BGCm89oLeLI7mSXeoZa/cZNIlzXJEDCyxIF8EX+shTP45Hz4o0keoW9aHkvZJgWLKI1gW9h wgZ2i0UBZWHAXPQXZcmg+6G/QHehrJOtiREX1VVXCn0bFr0o8LYZUUqtqzf1SUjlkapGdEhGoHbp6 5+ghsnkCvw2CguJwO2lUqBia22DkcPwKypEKlttLFFA90gVqTyz5wHGAQQzY0EO/MaEwbTAqfaiW/ KZmpNgihCe8nE3LnT4aQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDCfF-00HAfO-UC; Thu, 27 Jan 2022 21:50:46 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDCfC-00HAej-9L; Thu, 27 Jan 2022 21:50:43 +0000 Received: by mail-pj1-x102e.google.com with SMTP id my12-20020a17090b4c8c00b001b528ba1cd7so4427109pjb.1; Thu, 27 Jan 2022 13:50:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bPYN1y0P5vV2Se4amYQVixGh8Z0Upgf/B1r9635Dq04=; b=bkyYQxusr3zSqNY4Xt/NT/oMbZsjX0v5CJwGSwmXvL9pROv3rTHnXgFouQYjHEynGw mk/ieFvAk6YukjrVSeM77IhHHsDOG8QJDTkzlm7Qa+r9S6pLilRiLZwre60zJyMrhtjj X6f57BqpFDgeraghfMb6mTjp6Zfyb3uTClLQxjZj3sNTr2y9vSgRbptjEGm4FE9HL8ey LQk9e8mQtCaWk8X6sG7LfzUTHgNatTrm2LhqKaLPU/Tl79b6+VcVfaVXhUShNomLeQTc YORdr3RIPUNdFOHN9ABJX/EqSL8XhH11awY/PzQDqI5oLsIBHd+SZDw/zfLJyv7YZnrl D3NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bPYN1y0P5vV2Se4amYQVixGh8Z0Upgf/B1r9635Dq04=; b=px1AcSVqv81f3jGRwq5wCI7nIo6WEoQ2JenFLpgLrySsQQ74ZWPrJA8uuh+QQ842OP jGx/fIwQxJVqcbQmabxq6V/abVil2KLs4SriGBtWK1tDkgaUkcW2aAbgIsN7ZBbG0iVS 7Zv1hc6TKAIzdof5eTbLZQuacnJonk5YCb0XvRmeyllK4gY/XnRayws4BU7kYJnF1406 wdSWVR96X+GhlEtH4TZexUZ/cTm1X8VxAd075yBEgmGpLsctdiXkADTa3vaby/qsN7At 3LfhBM7J24mUDzZ0TiyFWU4Q6/1SZr1IjxKFRW8s83n1oWmodFolGdUFHFsXTK0Xhmqk 4g0g== X-Gm-Message-State: AOAM530VHUzRtx4LBvP854FcYrX24oU4K3rKx/QrGi9NMDfxDgBT/TWd dzFWHd9LrFrIp8qBWsN8cTk= X-Google-Smtp-Source: ABdhPJyDiKOPVs7PSeybcMqGT+1WLcaLVA9hNTX4HM3cU1nMFQNppy/umKeKJWkVxkFJVMtMUCPjHQ== X-Received: by 2002:a17:90b:1d01:: with SMTP id on1mr5407800pjb.77.1643320241519; Thu, 27 Jan 2022 13:50:41 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j6sm7073973pfu.18.2022.01.27.13.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 13:50:40 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Linus Walleij , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Nicolas Saenz Julienne , Phil Elwell , Krzysztof Kozlowski , Hans Verkuil , Andy Shevchenko , Jason Wang , Marc Zyngier , linux-gpio@vger.kernel.org (open list:PIN CONTROL SUBSYSTEM), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE) Subject: [PATCH] pinctrl: bcm2835: Fix a few error paths Date: Thu, 27 Jan 2022 13:50:31 -0800 Message-Id: <20220127215033.267227-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220127_135042_384771_1BD9FB46 X-CRM114-Status: GOOD ( 12.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org After commit 266423e60ea1 ("pinctrl: bcm2835: Change init order for gpio hogs") a few error paths would not unwind properly the registration of gpio ranges. Correct that by assigning a single error label and goto it whenever we encounter a fatal error. Fixes: 266423e60ea1 ("pinctrl: bcm2835: Change init order for gpio hogs") Signed-off-by: Florian Fainelli --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index c4ebfa852b42..47e433e09c5c 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1269,16 +1269,18 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) sizeof(*girq->parents), GFP_KERNEL); if (!girq->parents) { - pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); - return -ENOMEM; + err = -ENOMEM; + goto out_remove; } if (is_7211) { pc->wake_irq = devm_kcalloc(dev, BCM2835_NUM_IRQS, sizeof(*pc->wake_irq), GFP_KERNEL); - if (!pc->wake_irq) - return -ENOMEM; + if (!pc->wake_irq) { + err = -ENOMEM; + goto out_remove; + } } /* @@ -1306,8 +1308,10 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) len = strlen(dev_name(pc->dev)) + 16; name = devm_kzalloc(pc->dev, len, GFP_KERNEL); - if (!name) - return -ENOMEM; + if (!name) { + err = -ENOMEM; + goto out_remove; + } snprintf(name, len, "%s:bank%d", dev_name(pc->dev), i); @@ -1326,11 +1330,14 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) err = gpiochip_add_data(&pc->gpio_chip, pc); if (err) { dev_err(dev, "could not add GPIO chip\n"); - pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); - return err; + goto out_remove; } return 0; + +out_remove: + pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); + return err; } static struct platform_driver bcm2835_pinctrl_driver = {