diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-29 15:01:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:55:15 -0700 |
| commit | 5f8a5f4fa4c2c3fa7e66c7b002039a8046e4d99d (patch) | |
| tree | bc1e81af6da0efbd274cdcb05efecc2f8c8ff629 /drivers/staging/comedi/drivers/ni_pcimio.c | |
| parent | 3bb7c3abe34349a5f3615159d80aaee25c34e2a7 (diff) | |
| download | linux-rt-5f8a5f4fa4c2c3fa7e66c7b002039a8046e4d99d.tar.gz | |
staging: comedi: mite: use the comedi_device 'mmio' member
Use the new 'mmio' member in the comedi_device for the ioremap'ed
'daq_io_addr'.
Move the iounmap of this address from mite_detach() to the drivers
that use the mite module.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_pcimio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index b95019b7205f..da61fa70decf 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1123,6 +1123,8 @@ static void pcimio_detach(struct comedi_device *dev) mite_free_ring(devpriv->gpct_mite_ring[1]); mite_detach(devpriv->mite); } + if (dev->mmio) + iounmap(dev->mmio); comedi_pci_disable(dev); } |