From c650058038b5076ed98270e626c15943b3fdad84 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:15:14 -0700 Subject: [PATCH] --- yaml --- r: 364044 b: refs/heads/master c: ed34add734e33afa33e7bf5ee5826650efdc0fe8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08_isa.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 01853b4cc1f1..87f0da5ef58f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a983834ee4f537079fb12b9ba237b7347f217c93 +refs/heads/master: ed34add734e33afa33e7bf5ee5826650efdc0fe8 diff --git a/trunk/drivers/staging/comedi/drivers/das08_isa.c b/trunk/drivers/staging/comedi/drivers/das08_isa.c index f12078247163..a6de825cff12 100644 --- a/trunk/drivers/staging/comedi/drivers/das08_isa.c +++ b/trunk/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)