git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull vector-domain into release branch
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
tokenring
/
tmspci.c
diff --git
a/drivers/net/tokenring/tmspci.c
b/drivers/net/tokenring/tmspci.c
index 7d3e270c4f4539888d9caf0162688eaeb643ea80..3b2f00b9b7bd89a717734e16fa065a1e6991cd81 100644
(file)
--- a/
drivers/net/tokenring/tmspci.c
+++ b/
drivers/net/tokenring/tmspci.c
@@
-224,8
+224,7
@@
static void __devexit tms_pci_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
- if (!dev)
- BUG();
+ BUG_ON(!dev);
unregister_netdev(dev);
release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
free_irq(dev->irq, dev);