Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: addi_apci_1516: cleanup apci1516_detach()

Browse source 
This driver uses the comedi auto_config mechanism to attach to
the comedi subsystem. The dev->hw_dev is set by the core so
comedi_to_pci_dev() will always return a valid pcidev. Remove
the unnecessary test.

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-11-13 13:46:19 -07:00 • committed by Greg Kroah-Hartman
parent 9138de6b6b
commit 87722a7ab7
1 changed files with 2 additions and 4 deletions

6
drivers/staging/comedi/drivers/addi_apci_1516.c
View file

@ -289,11 +289,9 @@ static void apci1516_detach(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
if (dev->iobase)
if (dev->iobase) {
apci1516_reset(dev);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
comedi_pci_disable(pcidev);
}
}