---

yaml --- r: 354327 b: refs/heads/master c: 6746dc6 h: refs/heads/master i: 354325: 3c39572 354323: f0ea5c9 354319: 85f9810 v: v3
git-mirror · Feb 4, 2013 · ed44bfa · ed44bfa
1 parent 709a066
commit ed44bfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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",