From d8f99b24c0caec6f59423e797b72e5c2b07e600b Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 8 Apr 2013 10:56:20 -0700
Subject: [PATCH] --- yaml --- r: 363967 b: refs/heads/master c:
 46c58127ad544fda69cdab377ca4cb304c61202d h: refs/heads/master i:   363965:
 bec178cd0ec02cef628784e248af37090229dc45   363963:
 c336fc0f2690921e7a8d33ed6354b758ae7f8702   363959:
 7488a58a39181381d16f9f34da951f3fa13a9d95   363951:
 c3ce27c2c933c54c34f02c78d0caa552e92297c7   363935:
 0a50104bf22412864a38ee4f2a99ea0a4ec549db   363903:
 49deb8cdabcc25d3147c1b2f35863dee4b32a32e v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/comedi/comedi_pci.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 87a6f1308e54..4d65d0c796e4 100644
--- 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
index 6f3cdf88f05e..5fad084cfbd4 100644
--- 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