From 4e8d9ea0e64067bfe4274fa1a892389d06c12235 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:08:03 -0700 Subject: [PATCH] --- yaml --- r: 364025 b: refs/heads/master c: 9526728e0a8516b79f3c62c3a7583269f5195ccb h: refs/heads/master i: 364023: a224f80fc3d91f6781ff6a37ed9eaebc1b1eb59c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl725.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c27a1b796dca..dc103e7ad26e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ab88b6cad83076c1ee7ad411956ae9b9c2fd1e +refs/heads/master: 9526728e0a8516b79f3c62c3a7583269f5195ccb diff --git a/trunk/drivers/staging/comedi/drivers/pcl725.c b/trunk/drivers/staging/comedi/drivers/pcl725.c index 3cd5e7f04f42..5a2bc6733f60 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl725.c +++ b/trunk/drivers/staging/comedi/drivers/pcl725.c @@ -45,17 +45,11 @@ static int pcl725_di_insn(struct comedi_device *dev, struct comedi_subdevice *s, static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct comedi_subdevice *s; - unsigned long iobase; int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: pcl725: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, PCL725_SIZE, "pcl725")) { - printk("I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; - dev->irq = 0; + ret = comedi_request_region(dev, it->options[0], PCL725_SIZE); + if (ret) + return ret; ret = comedi_alloc_subdevices(dev, 2); if (ret)