Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962e5a36 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das16: use __comedi_request_region() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e9720fd2

drivers/staging/comedi/drivers/das16.c

+3 −6
Original line number Diff line number Diff line
@@ -1120,13 +1120,10 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		if (ret)

			return ret;

		/* Request an additional region for the 8255 */

		if (!request_region(dev->iobase + 0x400, board->size & 0x3ff,

				    dev->board_name)) {

		ret = __comedi_request_region(dev, dev->iobase + 0x400,

					      board->size & 0x3ff);

		if (ret) {

			release_region(dev->iobase, 0x10);

			dev_warn(dev->class_dev,

				 "%s: I/O port conflict (%#lx,%d)\n",

				 dev->board_name,

				 dev->iobase + 0x400, board->size & 0x3ff);

			dev->iobase = 0;

			return -EIO;

		}