From e225e1bd7117b63d3cbe226bc591bf2401d090c1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:30:29 -0700 Subject: [PATCH] --- yaml --- r: 364085 b: refs/heads/master c: e9720fd2b8fa65e4449c1d57b114dd4f6cc0a676 h: refs/heads/master i: 364083: 4b1f4de5cce3efcd5895bb530d3d93fdaea4d3ee v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/8255.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e307e339baa4..fec50831fa99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca8b296409c9800923fd431af15345e4da872bc0 +refs/heads/master: e9720fd2b8fa65e4449c1d57b114dd4f6cc0a676 diff --git a/trunk/drivers/staging/comedi/drivers/8255.c b/trunk/drivers/staging/comedi/drivers/8255.c index 0237187389e4..4b9125097e3b 100644 --- a/trunk/drivers/staging/comedi/drivers/8255.c +++ b/trunk/drivers/staging/comedi/drivers/8255.c @@ -372,16 +372,13 @@ static int dev_8255_attach(struct comedi_device *dev, s = &dev->subdevices[i]; iobase = it->options[i]; - if (!request_region(iobase, _8255_SIZE, "8255")) { - dev_warn(dev->class_dev, - "0x%04lx (I/O port conflict)\n", iobase); - + ret = __comedi_request_region(dev, iobase, _8255_SIZE); + if (ret) { s->type = COMEDI_SUBD_UNUSED; } else { ret = subdev_8255_init(dev, s, NULL, iobase); if (ret) return ret; - dev_info(dev->class_dev, "0x%04lx\n", iobase); } }