git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
tokenring
/
abyss.c
diff --git
a/drivers/net/tokenring/abyss.c
b/drivers/net/tokenring/abyss.c
index
1bdd3be
..
9345e68
100644
(file)
--- a/
drivers/net/tokenring/abyss.c
+++ b/
drivers/net/tokenring/abyss.c
@@
-123,7
+123,7
@@
static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
goto err_out_trdev;
}
goto err_out_trdev;
}
- ret = request_irq(pdev->irq, tms380tr_interrupt,
IRQF_SHARED
,
+ ret = request_irq(pdev->irq, tms380tr_interrupt,
SA_SHIRQ
,
dev->name, dev);
if (ret)
goto err_out_region;
dev->name, dev);
if (ret)
goto err_out_region;
@@
-438,7
+438,8
@@
static void __devexit abyss_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
{
struct net_device *dev = pci_get_drvdata(pdev);
- BUG_ON(!dev);
+ if (!dev)
+ BUG();
unregister_netdev(dev);
release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
free_irq(dev->irq, dev);
unregister_netdev(dev);
release_region(dev->base_addr-0x10, ABYSS_IO_EXTENT);
free_irq(dev->irq, dev);