Commit d09e18bc authored by Valentine Barshak's avatar Valentine Barshak Committed by Jeff Garzik

ibm_newemac: Call dev_set_drvdata() before tah_reset()

The patch moves dev_set_drvdata(&ofdev->dev, dev) up before tah_reset(ofdev)
is called to avoid a NULL pointer dereference, since tah_reset uses drvdata.
Signed-off-by: default avatarValentine Barshak <vbarshak@ru.mvista.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 63b6cad7
...@@ -116,13 +116,14 @@ static int __devinit tah_probe(struct of_device *ofdev, ...@@ -116,13 +116,14 @@ static int __devinit tah_probe(struct of_device *ofdev,
goto err_free; goto err_free;
} }
dev_set_drvdata(&ofdev->dev, dev);
/* Initialize TAH and enable IPv4 checksum verification, no TSO yet */ /* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
tah_reset(ofdev); tah_reset(ofdev);
printk(KERN_INFO printk(KERN_INFO
"TAH %s initialized\n", ofdev->node->full_name); "TAH %s initialized\n", ofdev->node->full_name);
wmb(); wmb();
dev_set_drvdata(&ofdev->dev, dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment