]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
staging: comedi: pcl818: use __comedi_request_region()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 23:32:03 +0000 (16:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:47:54 +0000 (12:47 -0700)
Use __comedi_request_region() to request the additional I/O region
used by this driver.

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>
drivers/staging/comedi/drivers/pcl818.c

index 6540186753eee6dce5d7d63246608637fab06585..8a1a8a5dc8c85f515f550fba7413671e5985a959 100644 (file)
@@ -1657,8 +1657,9 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        devpriv->dma_rtc = 0;
        if (it->options[2] > 0) {       /*  we want to use DMA */
                if (RTC_lock == 0) {
-                       if (!request_region(RTC_PORT(0), RTC_IO_EXTENT,
-                                           "pcl818 (RTC)"))
+                       ret = __comedi_request_resource(dev, RTC_PORT(0),
+                                                       RTC_IO_EXTENT);
+                       if (ret)
                                goto no_rtc;
                }
                devpriv->rtc_iobase = RTC_PORT(0);