diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-08-16 11:14:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-16 11:33:16 -0700 |
| commit | 6c292278288f9b29f994fe54cbe11cc30d021218 (patch) | |
| tree | de603eeab871a6c46304429211bbf75c3398c440 /drivers/staging/comedi/drivers/amplc_pc263.c | |
| parent | d26769446f5389fa5dd5b8745ddc12d4371fc267 (diff) | |
staging: comedi: amplc_pc263: check bus type in detach routine
When detaching the device in pc263_detach() mirror the bus type checks
performed by pc263_attach(). The existing tests are safe but rely on
dev->iobase being 0 when comedi_to_pci_dev(dev) is NULL.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/amplc_pc263.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc263.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index a389aea4d2ad..7aa82801e180 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c @@ -313,15 +313,18 @@ static int __devinit pc263_attach_pci(struct comedi_device *dev, static void pc263_detach(struct comedi_device *dev) { - struct pci_dev *pcidev = comedi_to_pci_dev(dev); + const struct pc263_board *thisboard = comedi_board(dev); - if (pcidev) { - if (dev->iobase) - comedi_pci_disable(pcidev); - pci_dev_put(pcidev); - } else { + if (is_isa_board(thisboard)) { if (dev->iobase) release_region(dev->iobase, PC263_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); + } } } |