From 48715a79ecfff2a580c54f30afcdc7b456f9493b Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 26 Feb 2010 10:15:04 +0100 Subject: [PATCH] --- yaml --- r: 186837 b: refs/heads/master c: 426054ce11ecb416048aa0f92628fa4ba93c3a0e h: refs/heads/master i: 186835: 1df2693f4714f82ad6e2292040f405b43dfb2269 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 72cb99c30863..1b72a44a2bb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1c54e82726fe51a55a18d15dc9377b8fd568ca2 +refs/heads/master: 426054ce11ecb416048aa0f92628fa4ba93c3a0e diff --git a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c b/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c index b16d652f7763..9511814e6413 100644 --- a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -173,9 +173,8 @@ static int contec_detach(struct comedi_device *dev) printk("comedi%d: contec: remove\n", dev->minor); if (devpriv && devpriv->pci_dev) { - if (dev->iobase) { + if (dev->iobase) comedi_pci_disable(devpriv->pci_dev); - } pci_dev_put(devpriv->pci_dev); }