From ed44bfaff003bf5f6696f5a4fefbc5ec32a22262 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 30 Jan 2013 16:46:39 -0700 Subject: [PATCH] --- yaml --- r: 354327 b: refs/heads/master c: 6746dc6340ea90e04f51825042d4e5e47472b951 h: refs/heads/master i: 354325: 3c39572083ea7f12ca3dd9246701a6804f205e68 354323: f0ea5c95492d9d0e72d4e7f5dcd87c08a820b846 354319: 85f98100117767c4c0f2f647e1c26058719386f4 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/ni_daq_dio24.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 89d9ac49b3df..31f880af5d69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5316ec545372cc991f9c48482db2febd7a6091ea +refs/heads/master: 6746dc6340ea90e04f51825042d4e5e47472b951 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index 123c4be98295..47268ddafbb1 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -126,18 +126,9 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void dio24_detach(struct comedi_device *dev) { - const struct dio24_board_struct *thisboard = comedi_board(dev); - struct comedi_subdevice *s; - - if (dev->subdevices) { - s = &dev->subdevices[0]; - subdev_8255_cleanup(dev, s); - } - if (thisboard->bustype != pcmcia_bustype && dev->iobase) - release_region(dev->iobase, DIO24_SIZE); - if (dev->irq) - free_irq(dev->irq, dev); -}; + if (dev->subdevices) + subdev_8255_cleanup(dev, &dev->subdevices[0]); +} static struct comedi_driver driver_dio24 = { .driver_name = "ni_daq_dio24",