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 E094DC7618F for ; Mon, 15 Jul 2019 15:09:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB8B92054F for ; Mon, 15 Jul 2019 15:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563203355; bh=UG91chrN/OOTQ14wBt92dwxM7zmzpsR+J/5kc7HEd+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gN1QTs4hmGhJPv0kBs6QOnAzuzlQ873bZFAlZlTByYDrVThCBM5CsuoJiH7w47kX0 USp7OuJ0v40AfhEkOSQ2pDCgbMG1h/CSzLzgPlOIcK7KhZwtwR53nNf4iN9SKTYTz4 eWRtvEMi0RvyxBfgbT8HNk51g+LnKPn1AwhYohus= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732114AbfGON5Q (ORCPT ); Mon, 15 Jul 2019 09:57:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:35082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732630AbfGON5O (ORCPT ); Mon, 15 Jul 2019 09:57:14 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.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 AFD70212F5; Mon, 15 Jul 2019 13:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199033; bh=UG91chrN/OOTQ14wBt92dwxM7zmzpsR+J/5kc7HEd+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KiQKYZ+PYEZbiJ34LUmout3LUTtYCJRglmnHR9L62Oj/3wsT0FfeBKqHWtxqEBKqa RS8ZAUltbaXHqRO6qJ+frstqlQLDoYup9RlvggzCNWCLYjhZaZNz3NKukoJRCPxKAD RkIIrekUYskx5yYGLZ1AxXlWkxi/NKqXUzc0+xkg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Osipenko , Peter De Schrijver , Daniel Lezcano , Sasha Levin , linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 170/249] clocksource/drivers/tegra: Release all IRQ's on request_irq() error Date: Mon, 15 Jul 2019 09:45:35 -0400 Message-Id: <20190715134655.4076-170-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Osipenko [ Upstream commit 7a3916706e858ad0bc3b5629c68168e1449de26a ] Release all requested IRQ's on the request error to properly clean up allocated resources. Signed-off-by: Dmitry Osipenko Acked-By: Peter De Schrijver Signed-off-by: Daniel Lezcano Signed-off-by: Sasha Levin --- drivers/clocksource/timer-tegra20.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/timer-tegra20.c b/drivers/clocksource/timer-tegra20.c index 1e7ece279730..fe5cc0963ac9 100644 --- a/drivers/clocksource/timer-tegra20.c +++ b/drivers/clocksource/timer-tegra20.c @@ -288,7 +288,7 @@ static int __init tegra_init_timer(struct device_node *np) pr_err("%s: can't map IRQ for CPU%d\n", __func__, cpu); ret = -EINVAL; - goto out; + goto out_irq; } irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN); @@ -298,7 +298,8 @@ static int __init tegra_init_timer(struct device_node *np) if (ret) { pr_err("%s: cannot setup irq %d for CPU%d\n", __func__, cpu_to->clkevt.irq, cpu); - ret = -EINVAL; + irq_dispose_mapping(cpu_to->clkevt.irq); + cpu_to->clkevt.irq = 0; goto out_irq; } } -- 2.20.1