net: smc91x: propagate irq return code

rjarzmik · davem330 · commit bd59cfc51df7 · 2016-02-16T15:02:23.000-05:00
The smc91x driver doesn't honor the probe deferral mechanism when the
interrupt source is not yet available, such as one provided by a gpio
controller not probed.

Fix this by propagating the platform_get_irq() error code as the probe
return value.

Signed-off-by: Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;
Cc: Sergei Shtylyov &lt;sergei.shtylyov@cogentembedded.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
@@ -2342,8 +2342,8 @@ static int smc_drv_probe(struct platform_device *pdev)
 	}
 
 	ndev->irq = platform_get_irq(pdev, 0);
-	if (ndev->irq <= 0) {
-		ret = -ENODEV;
+	if (ndev->irq < 0) {
+		ret = ndev->irq;
 		goto out_release_io;
 	}
 	/*

Original file line number	Diff line number	Diff line change
`@@ -2342,8 +2342,8 @@ static int smc_drv_probe(struct platform_device *pdev)`
`2342`	`2342`	`}`
`2343`	`2343`
`2344`	`2344`	`ndev->irq = platform_get_irq(pdev, 0);`
`2345`		`- if (ndev->irq <= 0) {`
`2346`		`- ret = -ENODEV;`
	`2345`	`+ if (ndev->irq < 0) {`
	`2346`	`+ ret = ndev->irq;`
`2347`	`2347`	`goto out_release_io;`
`2348`	`2348`	`}`
`2349`	`2349`	`/*`