From patchwork Mon Nov 9 12:55:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 322642 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 974C9C4741F for ; Mon, 9 Nov 2020 13:32:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 454312067B for ; Mon, 9 Nov 2020 13:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928724; bh=BwgKW1aqstHsbbwJVK/meH0BSrcNVm6TxkJLdXJ1XlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CmIdhBFSSxCkAWXhQ3+q4L4va8o6B6PQs2zCXmfI9nM5Iu45cS+RiPKuoyPksvfKd s97erEj1O+3Z7LabpT6Jl6B6juwQ8SpuTT2IzUSbNdmsj7SqWib9DYffvg0LOMHEBr tC2hzPI3vJv20Oury2yY9aajOZSzR69Fk9UmfQOU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731423AbgKINcD (ORCPT ); Mon, 9 Nov 2020 08:32:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:32962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730569AbgKINIP (ORCPT ); Mon, 9 Nov 2020 08:08:15 -0500 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 4CB8520867; Mon, 9 Nov 2020 13:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927294; bh=BwgKW1aqstHsbbwJVK/meH0BSrcNVm6TxkJLdXJ1XlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f1IQHRU9ODuln+y4TkIomJ0nOsDPQE8KRmpzCVCjCDfzKM+mbjYE17ny4azB1pEXD UNwtIrP/3fOpg3lD12TDMpbzx67FT0RSgfQgbdBhppzhc5KaPcINjqL6cPVhxtzXlK f/miq7YWTAknighOTjYqkzOZ6iTGFwvOZZ9U4o6M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Andrew Lunn , Jakub Kicinski Subject: [PATCH 4.19 11/71] sfp: Fix error handing in sfp_probe() Date: Mon, 9 Nov 2020 13:55:05 +0100 Message-Id: <20201109125020.445572052@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125019.906191744@linuxfoundation.org> References: <20201109125019.906191744@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: YueHaibing [ Upstream commit 9621618130bf7e83635367c13b9a6ee53935bb37 ] gpiod_to_irq() never return 0, but returns negative in case of error, check it and set gpio_irq to 0. Fixes: 73970055450e ("sfp: add SFP module support") Signed-off-by: YueHaibing Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/20201031031053.25264-1-yuehaibing@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/sfp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -1886,7 +1886,8 @@ static int sfp_probe(struct platform_dev continue; irq = gpiod_to_irq(sfp->gpio[i]); - if (!irq) { + if (irq < 0) { + irq = 0; poll = true; continue; }