---

yaml --- r: 363967 b: refs/heads/master c: 46c5812 h: refs/heads/master i: 363965: bec178c 363963: c336fc0 363959: 7488a58 363951: c3ce27c 363935: 0a50104 363903: 49deb8c v: v3
git-mirror · Apr 8, 2013 · d8f99b2 · d8f99b2
1 parent 59eb63e
commit d8f99b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae5dd5fcab2d9978e1a0a900a8598b4d92f02657
+refs/heads/master: 46c58127ad544fda69cdab377ca4cb304c61202d
diff --git a/trunk/drivers/staging/comedi/comedi_pci.c b/trunk/drivers/staging/comedi/comedi_pci.c
@@ -50,9 +50,7 @@ int comedi_pci_enable(struct comedi_device *dev)
 	if (rc < 0)
 		return rc;
 
-	rc = pci_request_regions(pcidev, dev->board_name
-						? dev->board_name
-						: dev->driver->driver_name);
+	rc = pci_request_regions(pcidev, dev->board_name);
 	if (rc < 0)
 		pci_disable_device(pcidev);
 	else