From 1df2693f4714f82ad6e2292040f405b43dfb2269 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 26 Feb 2010 10:15:02 +0100 Subject: [PATCH] --- yaml --- r: 186835 b: refs/heads/master c: 7c2f1946a5d41da3cfc1696944aaa420db5b5145 h: refs/heads/master i: 186833: 39d2cb658192b62c5b0f8222645bae9d139e8818 186831: d41088afa3a478eebe2ddfcdce5dc704b1ea3bfc v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcimdas.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9b256cbca41e..8a4d788548e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3a21d0ac2ee4f6c1be5314e76939867a2d0b470 +refs/heads/master: 7c2f1946a5d41da3cfc1696944aaa420db5b5145 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c index cbbca05acb96..2e61727fc9a0 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -330,11 +330,10 @@ static int cb_pcimdas_attach(struct comedi_device *dev, s = dev->subdevices + 2; /* digital i/o subdevice */ - if (thisboard->has_dio) { + if (thisboard->has_dio) subdev_8255_init(dev, s, NULL, devpriv->BADR4); - } else { + else s->type = COMEDI_SUBD_UNUSED; - } printk("attached\n"); @@ -365,9 +364,8 @@ static int cb_pcimdas_detach(struct comedi_device *dev) free_irq(dev->irq, dev); if (devpriv) { if (devpriv->pci_dev) { - if (devpriv->BADR0) { + if (devpriv->BADR0) comedi_pci_disable(devpriv->pci_dev); - } pci_dev_put(devpriv->pci_dev); } }