Use __comedi_request_region() to request the additional I/O region
used by this driver.
Remove the error message when the request_region() fails,
comedi_request_reqion() will output the error message if necessary.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/das16m1.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index 6c4fad5..77f213b 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -581,12 +581,11 @@ static int das16m1_attach(struct comedi_device *dev,
if (ret)
return ret;
/* Request an additional region for the 8255 */
- if (!request_region(dev->iobase + DAS16M1_82C55, DAS16M1_SIZE2,
- dev->board_name)) {
+ ret = __comedi_request_region(dev, dev->iobase + DAS16M1_82C55,
+ DAS16M1_SIZE2);
+ if (ret) {
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);
+ dev->iobase = 0;
return -EIO;
}
--
1.8.1.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
