Commit b7518888 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_dio200: check bus type in detach routine 



When detaching the device in dio200_detach() mirror the bus type checks
performed by dio200_attach().  The existing tests are safe but rely on
dev->iobase being 0 when comedi_to_pci_dev(dev) is NULL.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d99ff52e

drivers/staging/comedi/drivers/amplc_dio200.c

+8 −6
Original line number Diff line number Diff line
@@ -1417,7 +1417,6 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev, 
static void dio200_detach(struct comedi_device *dev)

{

	const struct dio200_board *thisboard = comedi_board(dev);

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	const struct dio200_layout_struct *layout;

	unsigned n;
@@ -1442,13 +1441,16 @@ static void dio200_detach(struct comedi_device *dev) 
			}

		}

	}

	if (IS_ISA_BOARD(thisboard)) {

		if (dev->iobase)

			release_region(dev->iobase, DIO200_IO_SIZE);

	} else if (IS_PCI_BOARD(thisboard)) {

		struct pci_dev *pcidev = comedi_to_pci_dev(dev);

		if (pcidev) {

			if (dev->iobase)

				comedi_pci_disable(pcidev);

			pci_dev_put(pcidev);

	} else {

		if (dev->iobase)

			release_region(dev->iobase, DIO200_IO_SIZE);

		}

	}

}