From 35522fc33b7e1b3afca8ccbecd161ef418c08857 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 09:50:37 +0000 Subject: [PATCH] --- yaml --- r: 209203 b: refs/heads/master c: b69bcd9d9c3c47ed76da9cc0215c2eda0b7c16cf h: refs/heads/master i: 209201: 3a5bbc147dd9412e78283c51d2264a280323fd77 209199: a4b7865cac9134ca7fa0f0b67fadaed886da601e v: v3 --- [refs] | 2 +- trunk/drivers/isdn/hardware/avm/c4.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bf64e83ed54c..d258287d93a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dacb397511289154a68dea1f4bd674c660161c23 +refs/heads/master: b69bcd9d9c3c47ed76da9cc0215c2eda0b7c16cf diff --git a/trunk/drivers/isdn/hardware/avm/c4.c b/trunk/drivers/isdn/hardware/avm/c4.c index 7715d3242ec8..d3530f6e8115 100644 --- a/trunk/drivers/isdn/hardware/avm/c4.c +++ b/trunk/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;