From 9206e627488d632bb6604fd6d36920bed87ea35a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Apr 2013 16:29:13 -0700 Subject: [PATCH] --- yaml --- r: 364081 b: refs/heads/master c: 70998b990b0489dcebd2e5b75a0e0cc3fff1065e h: refs/heads/master i: 364079: 050b4978cde4616a9fe54a50d743cc1d347a817b v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/multiq3.c | 20 +++++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 8f6da315faad..201fffc4d969 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4aa83c198082f4e703b8a424d1065f76d7885cdf +refs/heads/master: 70998b990b0489dcebd2e5b75a0e0cc3fff1065e diff --git a/trunk/drivers/staging/comedi/drivers/multiq3.c b/trunk/drivers/staging/comedi/drivers/multiq3.c index 475020652e4e..b6bc2dabbcc7 100644 --- a/trunk/drivers/staging/comedi/drivers/multiq3.c +++ b/trunk/drivers/staging/comedi/drivers/multiq3.c @@ -226,22 +226,16 @@ static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct multiq3_private *devpriv; - int result = 0; - unsigned long iobase; struct comedi_subdevice *s; + int ret; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: multiq3: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) { - printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], MULTIQ3_SIZE); + if (ret) + return ret; - result = comedi_alloc_subdevices(dev, 5); - if (result) - return result; + ret = comedi_alloc_subdevices(dev, 5); + if (ret) + return ret; devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv)