staging: comedi: das16m1: 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: 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>
This commit is contained in:
Родитель
962e5a36c7
Коммит
5950ae518f
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче