---

yaml --- r: 364052 b: refs/heads/master c: 6ca3f28 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · e53e870 · e53e870
1 parent 1bb5b51
commit e53e870
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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);