From 80a09cee04b73f0c36fa7d1be093c726d00d0a54 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:14:53 -0700 Subject: [PATCH] --- yaml --- r: 364043 b: refs/heads/master c: a983834ee4f537079fb12b9ba237b7347f217c93 h: refs/heads/master i: 364041: d631a8b280b6f93b8c8aa3145a14b41ab8b974b5 364039: 314deacf9a2766202aab75ccaf6fdd3644e07b56 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/das16m1.c | 20 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 8e8a89ed0bfc..01853b4cc1f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45f9fcc2ffe8664d3f9a019f150dc11862ab34f4 +refs/heads/master: a983834ee4f537079fb12b9ba237b7347f217c93 diff --git a/trunk/drivers/staging/comedi/drivers/das16m1.c b/trunk/drivers/staging/comedi/drivers/das16m1.c index 3c37a660a154..6c4fad5b2455 100644 --- a/trunk/drivers/staging/comedi/drivers/das16m1.c +++ b/trunk/drivers/staging/comedi/drivers/das16m1.c @@ -571,26 +571,24 @@ static int das16m1_attach(struct comedi_device *dev, struct comedi_subdevice *s; int ret; unsigned int irq; - unsigned long iobase; - - iobase = it->options[0]; devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv) return -ENOMEM; dev->private = devpriv; - if (!request_region(iobase, DAS16M1_SIZE, dev->board_name)) { - comedi_error(dev, "I/O port conflict\n"); - return -EIO; - } - if (!request_region(iobase + DAS16M1_82C55, DAS16M1_SIZE2, + ret = comedi_request_region(dev, it->options[0], DAS16M1_SIZE); + if (ret) + return ret; + /* Request an additional region for the 8255 */ + if (!request_region(dev->iobase + DAS16M1_82C55, DAS16M1_SIZE2, dev->board_name)) { - release_region(iobase, DAS16M1_SIZE); - comedi_error(dev, "I/O port conflict\n"); + release_region(dev->iobase, DAS16M1_SIZE); + dev_warn(dev->class_dev, "%s: I/O port conflict (%#lx,%d)\n", + dev->board_name, + dev->iobase + DAS16M1_82C55, DAS16M1_SIZE2); return -EIO; } - dev->iobase = iobase; /* now for the irq */ irq = it->options[1];