]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
sfp: Fix error handing in sfp_probe()
authorYueHaibing <yuehaibing@huawei.com>
Sat, 31 Oct 2020 03:10:53 +0000 (11:10 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Nov 2020 11:35:54 +0000 (12:35 +0100)
[ 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 <yuehaibing@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20201031031053.25264-1-yuehaibing@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/phy/sfp.c

index 998d08ae7431aef493ae70063268e7d2a0ebc53a..47d518e6d5d4f0d46538316262ebd074841c432a 100644 (file)
@@ -1886,7 +1886,8 @@ static int sfp_probe(struct platform_device *pdev)
                        continue;
 
                irq = gpiod_to_irq(sfp->gpio[i]);
-               if (!irq) {
+               if (irq < 0) {
+                       irq = 0;
                        poll = true;
                        continue;
                }