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

Commit c293fb78 authored by Gilles Chanteperdrix's avatar Gilles Chanteperdrix Committed by David S. Miller
Browse files

net/at91_ether: avoid NULL pointer dereference 



The at91_ether driver calls macb_mii_init passing a 'struct macb'
structure whose tx_clk member is initialized to 0. However,
macb_handle_link_change() expects tx_clk to be the result of
a call to clk_get, and so IS_ERR(tx_clk) to be true if the clock
is invalid. This causes an oops when booting Linux 3.14 on the
csb637 board. The following changes avoids this.

Signed-off-by: default avatarGilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 065d7e39

drivers/net/ethernet/cadence/at91_ether.c

+3 −0
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ static int __init at91ether_probe(struct platform_device *pdev) 
	}

	clk_enable(lp->pclk);



	lp->hclk = ERR_PTR(-ENOENT);

	lp->tx_clk = ERR_PTR(-ENOENT);



	/* Install the interrupt handler */

	dev->irq = platform_get_irq(pdev, 0);

	res = devm_request_irq(&pdev->dev, dev->irq, at91ether_interrupt, 0, dev->name, dev);