diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-06-27 15:07:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 15:40:06 -0700 |
| commit | 2d993c242fea1dc41395a40fd7001127afa3b090 (patch) | |
| tree | 0fe22476820c59199d3f4222002a86bce876f6e9 /drivers/staging/comedi/drivers/adl_pci6208.c | |
| parent | 7c1e5bc7544db67985fed627cba206fc5dee6405 (diff) | |
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci6208.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci6208.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; |