aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-09 19:31:44 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 15:47:54 -0400
commit8cafadee50dec318d2a9aca701eb43073bb600eb (patch)
treeaabd842845a8a3072dc96f5391b8b3814652f124 /drivers/staging
parent5950ae518f0bf9affbbb4b2178c27e516e4cacc5 (diff)
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 <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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/pcl816.c5
1 files changed, 3 insertions, 2 deletions
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)
1038 devpriv->dma_rtc = 0; 1038 devpriv->dma_rtc = 0;
1039 if (it->options[2] > 0) { /* we want to use DMA */ 1039 if (it->options[2] > 0) { /* we want to use DMA */
1040 if (RTC_lock == 0) { 1040 if (RTC_lock == 0) {
1041 if (!request_region(RTC_PORT(0), RTC_IO_EXTENT, 1041 ret = __comedi_request_region(dev, RTC_PORT(0),
1042 "pcl816 (RTC)")) 1042 RTC_IO_EXTENT);
1043 if (ret)
1043 goto no_rtc; 1044 goto no_rtc;
1044 } 1045 }
1045 devpriv->rtc_iobase = RTC_PORT(0); 1046 devpriv->rtc_iobase = RTC_PORT(0);