From ba7b34665a60c527d327269f07b9f8027d822c23 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:08:44 -0700 Subject: [PATCH] --- yaml --- r: 364027 b: refs/heads/master c: 99c671a636ad76c9a9694413c5a9c9e92545d417 h: refs/heads/master i: 364025: 4e8d9ea0e64067bfe4274fa1a892389d06c12235 364023: a224f80fc3d91f6781ff6a37ed9eaebc1b1eb59c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl726.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 1c4b84e31653..5828c1a85eb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44a6438bbea4e7fcf269aca8b7de1e6b37f0b7b2 +refs/heads/master: 99c671a636ad76c9a9694413c5a9c9e92545d417 diff --git a/trunk/drivers/staging/comedi/drivers/pcl726.c b/trunk/drivers/staging/comedi/drivers/pcl726.c index e4b7484988bd..cc35ff5b3f16 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl726.c +++ b/trunk/drivers/staging/comedi/drivers/pcl726.c @@ -225,23 +225,14 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) const struct pcl726_board *board = comedi_board(dev); struct pcl726_private *devpriv; struct comedi_subdevice *s; - unsigned long iobase; - unsigned int iorange; int ret, i; #ifdef ACL6126_IRQ unsigned int irq; #endif - iobase = it->options[0]; - iorange = board->io_range; - printk(KERN_WARNING "comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor, - board->name, iobase); - if (!request_region(iobase, iorange, dev->board_name)) { - printk(KERN_WARNING "I/O port conflict\n"); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], board->io_range); + if (ret) + return ret; devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv)