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=-16.1 required=3.0 tests=BAYES_00,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=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 7D3E8C43463 for ; Fri, 18 Sep 2020 02:17:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F338238EE for ; Fri, 18 Sep 2020 02:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395473; bh=sEnncAE7swknYM9ucIJ06y04dkrQWy4QGw1RueM3EMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qe7NnizRN9aWxloSvH9gbbCFiIrzF5cb0Tnust8D5GTn2bxNKbTZl9COO+3Mu0e+d wFWPqu5XkF5pITEJyaTVucJngrlwFCLuLFIAzfkpGVqwYTVWW7Wo5UyLxknJoW9frB T39O/+gCw+R+2cuMfQrStYna7mx9CrF4ukLT8/C8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729608AbgIRCRw (ORCPT ); Thu, 17 Sep 2020 22:17:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:48686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729579AbgIRCRp (ORCPT ); Thu, 17 Sep 2020 22:17:45 -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 0CFBF2395B; Fri, 18 Sep 2020 02:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395464; bh=sEnncAE7swknYM9ucIJ06y04dkrQWy4QGw1RueM3EMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQKRGKP0Gnm18H9JDf5r6jpJWhIIYBoO10V5mrfvNRN3ZduwkCrR0TBz2GYN1Qjk3 Z2TOVb6vRv1gqV3aFuMWCkH64izKGTM1c9u3lmCMiIVL2tgahcoeC+gf+IKE9dakB2 1XI5b5U1q+Kj4ddl5fL+9fkJvoCRP1zw9Bh3416A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tang Bin , Zhang Shengju , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 50/64] USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Date: Thu, 17 Sep 2020 22:16:29 -0400 Message-Id: <20200918021643.2067895-50-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918021643.2067895-1-sashal@kernel.org> References: <20200918021643.2067895-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tang Bin [ Upstream commit c856b4b0fdb5044bca4c0acf9a66f3b5cc01a37a ] If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in mv_ehci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here. Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin Link: https://lore.kernel.org/r/20200508114305.15740-1-tangbin@cmss.chinamobile.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/ehci-mv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c index 849806a75f1ce..273736e1d33fa 100644 --- a/drivers/usb/host/ehci-mv.c +++ b/drivers/usb/host/ehci-mv.c @@ -197,9 +197,8 @@ static int mv_ehci_probe(struct platform_device *pdev) hcd->regs = ehci_mv->op_regs; hcd->irq = platform_get_irq(pdev, 0); - if (!hcd->irq) { - dev_err(&pdev->dev, "Cannot get irq."); - retval = -ENODEV; + if (hcd->irq < 0) { + retval = hcd->irq; goto err_disable_clk; } -- 2.25.1