Au1x00: fix crash when trying register_netdev()
Subsystems (2)
PATCH 1/1 Au1x00: fix crash when trying register_netdev()
Andreas Lohre reported that the driver crashes when trying
to register_netdev(), he sugessted to move dev->netdev_ops initialization before calling register_netdev(), it worked for him.
Reported-by Andreas Lohre <[email protected]>
Signed-off-by Alexander Beregalov <[email protected]>
---
David, please send it to stable@ for 2.6.31
drivers/net/au1000_eth.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/au1000_eth.c +8 -7
@@ -1088,7 +1088,14 @@ static struct net_device * au1000_probe(int port_num)return NULL ; } -if ((err =register_netdev (dev)) !=0 ) { + dev->base_addr = base; + dev->irq = irq; + dev->netdev_ops = &au1000_netdev_ops; +SET_ETHTOOL_OPS (dev, &au1000_ethtool_ops); + dev->watchdog_timeo =ETH_TX_TIMEOUT ; + + err =register_netdev (dev); +if (err !=0 ) {printk (KERN_ERR "%s: Cannot register net device, error %d\n" ,DRV_NAME , err);free_netdev (dev);
@@ -1209,12 +1216,6 @@ static struct net_device * au1000_probe(int port_num) aup->tx_db_inuse[i] = pDB; } - dev->base_addr = base; - dev->irq = irq; - dev->netdev_ops = &au1000_netdev_ops; -SET_ETHTOOL_OPS (dev, &au1000_ethtool_ops); - dev->watchdog_timeo =ETH_TX_TIMEOUT ; -/* * The boot code uses the ethernet controller, so reset it to start * fresh. au1000_init() expects that the device is in reset state.
Signature · 1 line
1.6.5.3
From: Alexander Beregalov <[email protected]>
Date: Sat, 21 Nov 2009 06:07:35 +0300
Quoted 6 lines
Andreas Lohre reported that the driver crashes when trying
toregister_netdev(), he sugessted to movedev->netdev_opsinitialization before callingregister_netdev(), it worked for him.Reported-by Andreas Lohre <[email protected]>Signed-off-by Alexander Beregalov <[email protected]>
Applied.
Quoted 1 line
David, please send it to stable@ for 2.6.31
Will do, thanks.