projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux
[cascardo/linux.git]
/
drivers
/
isdn
/
hardware
/
avm
/
c4.c
diff --git
a/drivers/isdn/hardware/avm/c4.c
b/drivers/isdn/hardware/avm/c4.c
index
7715d32
..
d3530f6
100644
(file)
--- a/
drivers/isdn/hardware/avm/c4.c
+++ b/
drivers/isdn/hardware/avm/c4.c
@@
-1273,6
+1273,7
@@
static int __devinit c4_probe(struct pci_dev *dev,
if (retval != 0) {
printk(KERN_ERR "c4: no AVM-C%d at i/o %#x, irq %d detected, mem %#x\n",
nr, param.port, param.irq, param.membase);
+ pci_disable_device(dev);
return -ENODEV;
}
return 0;