From patchwork Tue Oct 27 13:53:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 307095 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=-12.8 required=3.0 tests=BAYES_00,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 A7304C63777 for ; Tue, 27 Oct 2020 17:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B99A208B8 for ; Tue, 27 Oct 2020 17:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819900; bh=5o+yxZX1mU8gGvdDUupcWkARggDyA4/HHpz9PRZbCnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0CJI6Gs93kXNx69AQ55ECy8FRDVUAoNB6niuwgy4S5DljQRTClMI11Pav8rTjCceJ 6okSPZzaqY1oNcMu+8z8mTNxmEUU8O4e6Die4I7uRI3ii0dRFgNWBoZfYYv1vrKrrN WcSfYmtP6Ru8olXi6/tv20k7gCyV+C+YnTWCLN2g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1819387AbgJ0Rbh (ORCPT ); Tue, 27 Oct 2020 13:31:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:40660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762172AbgJ0OlU (ORCPT ); Tue, 27 Oct 2020 10:41:20 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 053F5206B2; Tue, 27 Oct 2020 14:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809679; bh=5o+yxZX1mU8gGvdDUupcWkARggDyA4/HHpz9PRZbCnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uToemrbxKoDFGHic2UGVi5f4ru/0yArW2nB7mV3Flhyz88KkgQTAmYHK5ZntPeIcd sTgsHya+G3/JxDXbg/+oR/NcaJDXczrNiHnZPHaJcxKNRH7pdQMCqdQ/mRawvCgHkE /xRnXFq9emWLzbzL2nwLd4rdvWvVexdAGfojkx6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Jassi Brar , Sasha Levin Subject: [PATCH 5.4 250/408] maiblox: mediatek: Fix handling of platform_get_irq() error Date: Tue, 27 Oct 2020 14:53:08 +0100 Message-Id: <20201027135506.654187848@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Krzysztof Kozlowski [ Upstream commit 558e4c36ec9f2722af4fe8ef84dc812bcdb5c43a ] platform_get_irq() returns -ERRNO on error. In such case casting to u32 and comparing to 0 would pass the check. Fixes: 623a6143a845 ("mailbox: mediatek: Add Mediatek CMDQ driver") Signed-off-by: Krzysztof Kozlowski Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/mtk-cmdq-mailbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 9a6ce9f5a7db5..3c8b365ce635a 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -70,7 +70,7 @@ struct cmdq_task { struct cmdq { struct mbox_controller mbox; void __iomem *base; - u32 irq; + int irq; u32 thread_nr; u32 irq_mask; struct cmdq_thread *thread; @@ -474,10 +474,8 @@ static int cmdq_probe(struct platform_device *pdev) } cmdq->irq = platform_get_irq(pdev, 0); - if (!cmdq->irq) { - dev_err(dev, "failed to get irq\n"); - return -EINVAL; - } + if (cmdq->irq < 0) + return cmdq->irq; cmdq->thread_nr = (u32)(unsigned long)of_device_get_match_data(dev); cmdq->irq_mask = GENMASK(cmdq->thread_nr - 1, 0);