diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
| commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
| tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /drivers/net/starfire.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/starfire.c')
| -rw-r--r-- | drivers/net/starfire.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 35b18057fbdd..45ad036733e2 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -2122,8 +2122,7 @@ static void __devexit starfire_remove_one (struct pci_dev *pdev) | |||
| 2122 | struct net_device *dev = pci_get_drvdata(pdev); | 2122 | struct net_device *dev = pci_get_drvdata(pdev); |
| 2123 | struct netdev_private *np = netdev_priv(dev); | 2123 | struct netdev_private *np = netdev_priv(dev); |
| 2124 | 2124 | ||
| 2125 | if (!dev) | 2125 | BUG_ON(!dev); |
| 2126 | BUG(); | ||
| 2127 | 2126 | ||
| 2128 | unregister_netdev(dev); | 2127 | unregister_netdev(dev); |
| 2129 | 2128 | ||