From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:32:03 +0000 (-0700) Subject: staging: comedi: pcl818: use __comedi_request_region() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e5fc06aa78283b8da5c1547da1bb7e81a0ebb3d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: comedi: pcl818: use __comedi_request_region() Use __comedi_request_region() to request the additional I/O region used by this driver. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 6540186753ee..8a1a8a5dc8c8 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -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);