Commit 1a6671d2 authored Sep 03, 2012 by Ian Abbott Committed by Greg Kroah-Hartman Sep 04, 2012

staging: comedi: amplc_dio200: Fix PCI ref count



When attaching a PCI device manually via the comedi driver `attach` hook
(`dio200_attach()`) (called by the comedi core for the
`COMEDI_DEVCONFIG` ioctl), its reference count is incremented in the
`for_each_pci_dev` loop (in `dio200_find_pci_dev()`).  It is decremented
when the `detach` hook (`dio200_detach()`) is called to detach the
device.  However, when the PCI device is attached automatically via the
`attach_pci` hook (`dio200_attach_pci()`, called at probe time via
`comedi_pci_auto_config()`) it's reference count is not incremented so
there will be an unmatched decrement when detaching the device.

Increment the PCI device reference count in `dio200_attach_pci()` to
correct the mismatch.

Once support for manual configuration has been removed from this driver,
the calls to `pci_dev_get()` and `pci_dev_put()` can be removed.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cadf84bf

drivers/staging/comedi/drivers/amplc_dio200.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1412,6 +1412,13 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
	dev_err(dev->class_dev, "BUG! cannot determine board type!\n");		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in dio200_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via dio200_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return dio200_pci_common_attach(dev, pci_dev);		return dio200_pci_common_attach(dev, pci_dev);
	}		}