p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: comedi: das16: use comedi_legacy_detach() 

Use the new comedi_legacy_detach() helper in the (*detach) to release
the first I/O region requested by this driver.

An additional I/O region is requested for some of the boards this driver
supports. Save the iobase for that region in the private data so that
the (*detach) knows it needs to be released.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-04-18 14:32:12 -07:00 committed by Greg Kroah-Hartman
parent a3fd5e517a
commit adfaa207ca
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/comedi/drivers/das16.c
View File

@ -393,6 +393,8 @@ struct das16_private_struct {
struct timer_list timer; /* for timed interrupt */
volatile short timer_running;
volatile short timer_mode; /* true if using timer mode */
unsigned long extra_iobase;
};
static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
@ -1122,11 +1124,9 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Request an additional region for the 8255 */
ret = __comedi_request_region(dev, dev->iobase + 0x400,
board->size & 0x3ff);
if (ret) {
release_region(dev->iobase, 0x10);
dev->iobase = 0;
return -EIO;
}
if (ret)
return ret;
devpriv->extra_iobase = dev->iobase + 0x400;
}
/* probe id bits to make sure they are consistent */
@ -1356,15 +1356,9 @@ static void das16_detach(struct comedi_device *dev)
}
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase) {
if (board->size < 0x400) {
release_region(dev->iobase, board->size);
} else {
release_region(dev->iobase, 0x10);
release_region(dev->iobase + 0x400,
board->size & 0x3ff);
}
}
if (devpriv->extra_iobase)
release_region(devpriv->extra_iobase, board->size & 0x3ff);
comedi_legacy_detach(dev);
}
static const struct das16_board das16_boards[] = {