dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: comedi: adv_pci1723: move comedi_pci_enable() into the attach 

Use pci_is_enabled() in the "find pci device" function to determine if
the found pci device is not in use and move the comedi_pci_enable() call
into the attach.

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>
This commit is contained in:
H Hartley Sweeten 2012-07-18 18:30:48 -07:00 committed by Greg Kroah-Hartman
parent 3dbd666ca4
commit cc04c8a5fc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/adv_pci1723.c
View File

@ -302,11 +302,7 @@ static struct pci_dev *pci1723_find_pci_dev(struct comedi_device *dev,
}
if (pcidev->vendor != PCI_VENDOR_ID_ADVANTECH)
continue;
/*
* Look for device that isn't in use.
* Enable PCI device and request regions.
*/
if (comedi_pci_enable(pcidev, "adv_pci1723"))
if (pci_is_enabled(pcidev))
continue;
return pcidev;
}
@ -335,6 +331,10 @@ static int pci1723_attach(struct comedi_device *dev,
if (!devpriv->pcidev)
return -EIO;
ret = comedi_pci_enable(devpriv->pcidev, "adv_pci1723");
if (ret)
return ret;
dev->iobase = pci_resource_start(devpriv->pcidev, 2);
dev->board_name = this_board->name;