diff --git a/[refs] b/[refs] index fe68cd5e8b8c..1b566035fa0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3871a752ec5695d84dd9d24d55daed3b72023268 +refs/heads/master: 6ca3f28b8529d9401a7be7641a8951c12443e05d diff --git a/trunk/drivers/staging/comedi/drivers/dt2811.c b/trunk/drivers/staging/comedi/drivers/dt2811.c index be9aaa7e42c6..16cbd540ab31 100644 --- a/trunk/drivers/staging/comedi/drivers/dt2811.c +++ b/trunk/drivers/staging/comedi/drivers/dt2811.c @@ -399,18 +399,10 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct dt2811_private *devpriv; int ret; struct comedi_subdevice *s; - unsigned long iobase; - iobase = it->options[0]; - - printk(KERN_INFO "comedi%d: dt2811:base=0x%04lx\n", dev->minor, iobase); - - if (!request_region(iobase, DT2811_SIZE, dev->board_name)) { - printk(KERN_ERR "I/O port conflict\n"); - return -EIO; - } - - dev->iobase = iobase; + ret = comedi_request_region(dev, it->options[0], DT2811_SIZE); + if (ret) + return ret; #if 0 outb(0, dev->iobase + DT2811_ADCSR);