mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
pcmcia: fix 'driver ... did not release config properly' warning
Up to 2.6.34 pcmcia_release_irq() reset p_dev->_irq to 0 after releasing the irq. The IRQ is now released in pcmcia_disable_device(), however p_dev->_irq is not reset, triggering a warning in pcmcia_device_remove(). Signed-off-by: Patrick McHardy <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
This commit is contained in:
parent
f4b23cc2d5
commit
418c527873
1 changed files with 3 additions and 1 deletions
|
|
@ -857,8 +857,10 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev)
|
|||
{
|
||||
pcmcia_release_configuration(p_dev);
|
||||
pcmcia_release_io(p_dev, &p_dev->io);
|
||||
if (p_dev->_irq)
|
||||
if (p_dev->_irq) {
|
||||
free_irq(p_dev->irq, p_dev->priv);
|
||||
p_dev->_irq = 0;
|
||||
}
|
||||
if (p_dev->win)
|
||||
pcmcia_release_window(p_dev, p_dev->win);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue