net: thunderx: avoid dereferencing xcv when NULL

vstehle · davem330 · commit c73e44269369 · 2017-01-31T13:07:40.000-05:00
This fixes the following smatch and coccinelle warnings: drivers/net/ethernet/cavium/thunder/thunder_xcv.c:119 xcv_setup_link() error: we previously assumed 'xcv' could be null (see line 118) [smatch] drivers/net/ethernet/cavium/thunder/thunder_xcv.c:119:16-20: ERROR: xcv is NULL but dereferenced. [coccinelle] Fixes: 6465859 ("net: thunderx: Add RGMII interface type support") Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Cc: Sunil Goutham <sgoutham@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c
@@ -116,8 +116,7 @@ void xcv_setup_link(bool link_up, int link_speed)
 	int speed = 2;
 
 	if (!xcv) {
-		dev_err(&xcv->pdev->dev,
-			"XCV init not done, probe may have failed\n");
+		pr_err("XCV init not done, probe may have failed\n");
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,7 @@ void xcv_setup_link(bool link_up, int link_speed)`
`116`	`116`	`int speed = 2;`
`117`	`117`
`118`	`118`	`if (!xcv) {`
`119`		`- dev_err(&xcv->pdev->dev,`
`120`		`- "XCV init not done, probe may have failed\n");`
	`119`	`+ pr_err("XCV init not done, probe may have failed\n");`
`121`	`120`	`return;`
`122`	`121`	`}`
`123`	`122`