ibm_newemac: Call dev_set_drvdata() before tah_reset()

PATCH In review Benjamin Herrenschmidt 1 participant 1 message Dec 5, 2007

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Benjamin Herrenschmidt

author

2007-12-05 00:14 UTC #0 lore raw

PATCH 10/11 ibm_newemac: Call dev_set_drvdata() before tah_reset()

From: Valentine Barshak <[email protected]>

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 Valentine Barshak <[email protected]>

Signed-off-by Benjamin Herrenschmidt <[email protected]>

---

drivers/net/ibm_newemac/tah.c +2 -1

diff -pruN linux-2.6.orig/drivers/net/ibm_newemac/tah.c linux-2.6/drivers/net/ibm_newemac/tah.c
@@ -116,13 +116,14 @@ static int __devinit tah_probe(struct of
 		goto err_free;
 	}
 
+	dev_set_drvdata(&ofdev->dev, dev);
+
 	/* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
 	tah_reset(ofdev);
 
 	printk(KERN_INFO
 	       "TAH %s initialized\n", ofdev->node->full_name);
 	wmb();
-	dev_set_drvdata(&ofdev->dev, dev);
 
 	return 0;