From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:31:44 +0000 (-0700) Subject: staging: comedi: pcl816: use __comedi_request_region() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8cafadee50dec318d2a9aca701eb43073bb600eb;p=deliverable%2Flinux.git staging: comedi: pcl816: 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/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 6266b2b02597..2fd688a5c63e 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -1038,8 +1038,9 @@ static int pcl816_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, - "pcl816 (RTC)")) + ret = __comedi_request_region(dev, RTC_PORT(0), + RTC_IO_EXTENT); + if (ret) goto no_rtc; } devpriv->rtc_iobase = RTC_PORT(0);