octeon_ep: fix error return code in octep_probe()

Yang Yingliang · davem330 · commit 0a03f3c511f5 · 2022-04-15T11:49:20.000+01:00
If register_netdev() fails , it should return error code in octep_probe(). Fixes: 862cd65 ("octeon_ep: Add driver framework and device initialization") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -1071,7 +1071,8 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	octep_get_mac_addr(octep_dev, octep_dev->mac_addr);
 	eth_hw_addr_set(netdev, octep_dev->mac_addr);
 
-	if (register_netdev(netdev)) {
+	err = register_netdev(netdev);
+	if (err) {
 		dev_err(&pdev->dev, "Failed to register netdev\n");
 		goto register_dev_err;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,8 @@ static int octep_probe(struct pci_dev pdev, const struct pci_device_id ent)`
`1071`	`1071`	`octep_get_mac_addr(octep_dev, octep_dev->mac_addr);`
`1072`	`1072`	`eth_hw_addr_set(netdev, octep_dev->mac_addr);`
`1073`	`1073`
`1074`		`- if (register_netdev(netdev)) {`
	`1074`	`+ err = register_netdev(netdev);`
	`1075`	`+ if (err) {`
`1075`	`1076`	`dev_err(&pdev->dev, "Failed to register netdev\n");`
`1076`	`1077`	`goto register_dev_err;`
`1077`	`1078`	`}`