summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-09 16:15:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 12:47:38 -0700
commited34add734e33afa33e7bf5ee5826650efdc0fe8 (patch)
treeba112a887479fdd7580a9b4db6e69740ecdfbd1c
parenta983834ee4f537079fb12b9ba237b7347f217c93 (diff)
staging: comedi: das08_isa: use comedi_request_region()
Use comedi_request_region() to request the I/O region used by this driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/das08_isa.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/das08_isa.c b/drivers/staging/comedi/drivers/das08_isa.c
index f12078247163..a6de825cff12 100644
--- a/drivers/staging/comedi/drivers/das08_isa.c
+++ b/drivers/staging/comedi/drivers/das08_isa.c
@@ -179,17 +179,18 @@ static int das08_isa_attach(struct comedi_device *dev,
{
const struct das08_board_struct *thisboard = comedi_board(dev);
struct das08_private_struct *devpriv;
+ int ret;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;
- if (!request_region(it->options[0], thisboard->iosize,
- thisboard->name))
- return -EIO;
+ ret = comedi_request_region(dev, it->options[0], thisboard->iosize);
+ if (ret)
+ return ret;
- return das08_common_attach(dev, it->options[0]);
+ return das08_common_attach(dev, dev->iobase);
}
static void das08_isa_detach(struct comedi_device *dev)