---

yaml --- r: 324460 b: refs/heads/master c: 3cf05dd h: refs/heads/master v: v3
git-mirror · Aug 14, 2012 · f0b6261 · f0b6261
1 parent 3c6a083
commit f0b6261
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 270809a80fb610b54de5ee792a607dc37a71195c
+refs/heads/master: 3cf05ddb0d7c5612ee70f250f22427462d820fe1
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -196,12 +196,9 @@ static int pci6208_attach_pci(struct comedi_device *dev,
 		return ret;
 	devpriv = dev->private;
 
-	ret = comedi_pci_enable(pcidev, dev->driver->driver_name);
-	if (ret) {
-		dev_err(dev->class_dev,
-			"Failed to enable PCI device and request regions\n");
+	ret = comedi_pci_enable(pcidev, dev->board_name);
+	if (ret)
 		return ret;
-	}
 	dev->iobase = pci_resource_start(pcidev, 2);
 
 	ret = comedi_alloc_subdevices(dev, 3);