diff --git a/[refs] b/[refs] index 1b566035fa0d..25f7e0c32939 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ca3f28b8529d9401a7be7641a8951c12443e05d +refs/heads/master: c5c18cd3661e57ef09b545570dac891c53b981e4 diff --git a/trunk/drivers/staging/comedi/drivers/dt2814.c b/trunk/drivers/staging/comedi/drivers/dt2814.c index e4d629e6d06e..46dca8e8a8a1 100644 --- a/trunk/drivers/staging/comedi/drivers/dt2814.c +++ b/trunk/drivers/staging/comedi/drivers/dt2814.c @@ -246,15 +246,10 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it) int i, irq; int ret; struct comedi_subdevice *s; - unsigned long iobase; - iobase = it->options[0]; - printk(KERN_INFO "comedi%d: dt2814: 0x%04lx ", dev->minor, iobase); - if (!request_region(iobase, DT2814_SIZE, "dt2814")) { - printk(KERN_ERR "I/O port conflict\n"); - return -EIO; - } - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], DT2814_SIZE); + if (ret) + return ret; outb(0, dev->iobase + DT2814_CSR); udelay(100);