From 707dbb38bdd865f3b05b2aff02593b7f430e84b9 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:33:59 -0700
Subject: [PATCH] --- yaml --- r: 364095 b: refs/heads/master c:
 7a1e1f9ae5f15026126f09311b158d6673ad8200 h: refs/heads/master i:   364093:
 29561660c51bc66396112aa5cdeaa8e24a8f2602   364091:
 b46b6a4e06a0644e5fbd269192d657f5c198f29d   364087:
 a58ea4c5b215b1244a0e12fd7505a9ac601bf383   364079:
 050b4978cde4616a9fe54a50d743cc1d347a817b   364063:
 df6725490c0d1f3943ffb26ae69d2993fe44bf3c   364031:
 c52d921fce9e6bc499f995f5421787cc72701697 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/comedi/drivers/ni_labpc.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 127876fc146a..2eb7d383a20b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bb3395e4b1f497030ea14103ab110e33e1eabd8
+refs/heads/master: 7a1e1f9ae5f15026126f09311b158d6673ad8200
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
index 22f8d45ae6d5..e46854f8e932 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c
@@ -1616,8 +1616,6 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
 	int ret;
 	int i;
 
-	dev->board_name = board->name;
-
 	if (iobase == 0)
 		return -EINVAL;
 	if (board->bustype == isa_bustype) {
@@ -1831,6 +1829,7 @@ static int labpc_auto_attach(struct comedi_device *dev,
 				       unsigned long context_unused)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+	const struct labpc_boardinfo *board;
 	struct labpc_private *devpriv;
 	unsigned long iobase;
 	unsigned int irq;
@@ -1848,9 +1847,11 @@ static int labpc_auto_attach(struct comedi_device *dev,
 		return -ENOMEM;
 	dev->private = devpriv;
 
-	dev->board_ptr = labpc_pci_find_boardinfo(pcidev);
-	if (!dev->board_ptr)
+	board = labpc_pci_find_boardinfo(pcidev);
+	if (!board)
 		return -ENODEV;
+	dev->board_ptr = board;
+	dev->board_name = board->name;
 	devpriv->mite = mite_alloc(pcidev);
 	if (!devpriv->mite)
 		return -ENOMEM;