From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 27 Jun 2012 22:07:56 +0000 (-0700)
Subject: staging: comedi: adl_pci6208: cleanup pci6208_attach()
X-Git-Tag: firefly_0821_release~3680^2~2356^2~457
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d993c242fea1dc41395a40fd7001127afa3b090;p=firefly-linux-kernel-4.4.55.git

staging: comedi: adl_pci6208: cleanup pci6208_attach()

For aesthetic reasons, set the dev->board_name as soon as the
thisboard pointer is available.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index aa2db5d532af..cb14ffd9967e 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -213,17 +213,16 @@ static int pci6208_attach(struct comedi_device *dev,
 		return -EIO;
 	thisboard = comedi_board(dev);
 
+	dev->board_name = thisboard->name;
+
 	ret = comedi_pci_enable(devpriv->pci_dev, "adl_pci6208");
 	if (ret) {
 		dev_err(dev->class_dev,
 			"Failed to enable PCI device and request regions\n");
 		return ret;
 	}
-
 	dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
 
-	dev->board_name = thisboard->name;
-
 	ret = comedi_alloc_subdevices(dev, 2);
 	if (ret)
 		return ret;