From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 F2E07C433E0 for ; Thu, 18 Jun 2020 01:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9053221F7 for ; Thu, 18 Jun 2020 01:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442955; bh=jooARIFQyutBq1ygAucaUY+mBk/+xG06hczMM+cGxrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NNT/lpb/dK3Zaez5HLFTspkRfBu3QmnGJMjBh8/fj4HDUSOd95bvz2Vf8LiKaG1ZW iM2azAdIPNsMPm+5CRdZgxMc8/vg6fioAhCIb0NC/oH/sNAdOf4zhDn6xP6NgTN0qr eD/laPFCrfS0EGbLBtO5DHqQrz26ikCkvZ5s6r8s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728385AbgFRBPx (ORCPT ); Wed, 17 Jun 2020 21:15:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:43516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728998AbgFRBOB (ORCPT ); Wed, 17 Jun 2020 21:14:01 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53E9921974; Thu, 18 Jun 2020 01:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442841; bh=jooARIFQyutBq1ygAucaUY+mBk/+xG06hczMM+cGxrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jbyG4FTpYNczbsQY+Nn9innScIf3jK36+4gT1eELVXfpc5tWp1qsDCre8CMP4Gnwe NU4dU/pZ+0XQxqMkhBNCDqato9/A18eADp93RZPFkh8qYv2f/R8zvF+pOPc+S1BQuz nlCk9yAuf7P3lUTNyKa9njIfTlQfZX0BK561Gmk8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Amelie Delaunay , Lee Jones , Sasha Levin , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 274/388] mfd: stmfx: Fix stmfx_irq_init error path Date: Wed, 17 Jun 2020 21:06:11 -0400 Message-Id: <20200618010805.600873-274-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Amelie Delaunay [ Upstream commit 60c2c4bcb9202acad4cc26af20b44b6bd7874f7b ] In case the interrupt signal can't be configured, IRQ domain needs to be removed. Fixes: 06252ade9156 ("mfd: Add ST Multi-Function eXpander (STMFX) core driver") Signed-off-by: Amelie Delaunay Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/stmfx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index fde6541e347c..1977fe95f876 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -287,14 +287,19 @@ static int stmfx_irq_init(struct i2c_client *client) ret = regmap_write(stmfx->map, STMFX_REG_IRQ_OUT_PIN, irqoutpin); if (ret) - return ret; + goto irq_exit; ret = devm_request_threaded_irq(stmfx->dev, client->irq, NULL, stmfx_irq_handler, irqtrigger | IRQF_ONESHOT, "stmfx", stmfx); if (ret) - stmfx_irq_exit(client); + goto irq_exit; + + return 0; + +irq_exit: + stmfx_irq_exit(client); return ret; } -- 2.25.1