diff options
| author | Valentine Barshak <vbarshak@ru.mvista.com> | 2007-12-05 11:14:32 +1100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-07 15:09:06 -0500 |
| commit | d09e18bc194c3fa8ae880df4567c719c36a73e9e (patch) | |
| tree | 9408f49b0ace39e09c60bb0f18ce6d85808395fa | |
| parent | 63b6cad795e0a34e8670291943df8a6f653c1931 (diff) | |
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: Valentine Barshak <vbarshak@ru.mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/ibm_newemac/tah.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c index f161fb100e8e..6e35cbe15931 100644 --- a/drivers/net/ibm_newemac/tah.c +++ b/drivers/net/ibm_newemac/tah.c @@ -116,13 +116,14 @@ static int __devinit tah_probe(struct of_device *ofdev, 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; |