Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fa0043d authored by Robert Hancock's avatar Robert Hancock Committed by David S. Miller
Browse files

net: axienet: move use of resource after validity check 



We were accessing the pointer returned from platform_get_resource before
checking if it was valid, causing an oops if it was not. Move this access
after the call to devm_ioremap_resource which does the validity check.

Signed-off-by: default avatarRobert Hancock <hancock@sedsystems.ca>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9a94f85

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1679,13 +1679,13 @@ static int axienet_probe(struct platform_device *pdev) 
	lp->tx_bd_num = TX_BD_NUM_DEFAULT;

	/* Map device registers */

	ethres = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	lp->regs_start = ethres->start;

	lp->regs = devm_ioremap_resource(&pdev->dev, ethres);

	if (IS_ERR(lp->regs)) {

		dev_err(&pdev->dev, "could not map Axi Ethernet regs.\n");

		ret = PTR_ERR(lp->regs);

		goto free_netdev;

	}

	lp->regs_start = ethres->start;



	/* Setup checksum offload, but default to off if not specified */

	lp->features = 0;