diff options
| author | Steve Glendinning <steve.glendinning@smsc.com> | 2008-12-26 01:40:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-26 01:40:19 +0100 |
| commit | dd0451938815d8b901488b1058f52023892c6cde (patch) | |
| tree | dbb70ece42aa24d11cbf567357080b1f13eb8c2f /drivers/net/smsc911x.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-dd0451938815d8b901488b1058f52023892c6cde.tar.xz linux-dd0451938815d8b901488b1058f52023892c6cde.zip | |
smsc911x: fix BUG if module is removed while interface is up
If the module is removed while its interface is up, smsc911x_stop is not
called until after smsc911x_drv_remove has disposed of phy_dev. This
patch changes the stop method to handle this situation.
This is a different problem to the one reported by dfoley@telus.net.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index ecdde03d4167..8078f3545f16 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -1267,8 +1267,6 @@ static int smsc911x_stop(struct net_device *dev) struct smsc911x_data *pdata = netdev_priv(dev); unsigned int temp; - BUG_ON(!pdata->phy_dev); - /* Disable all device interrupts */ temp = smsc911x_reg_read(pdata, INT_CFG); temp &= ~INT_CFG_IRQ_EN_; @@ -1283,7 +1281,8 @@ static int smsc911x_stop(struct net_device *dev) smsc911x_tx_update_txcounters(dev); /* Bring the PHY down */ - phy_stop(pdata->phy_dev); + if (pdata->phy_dev) + phy_stop(pdata->phy_dev); SMSC_TRACE(IFDOWN, "Interface stopped"); return 0; |