diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 12:56:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 12:56:20 -0800 |
| commit | f842839cd85be149ff158bddf0260cd1a8db69e5 (patch) | |
| tree | b62eb4c73e7f7ad0e988a106421847100779c6b2 /drivers | |
| parent | abb7099dbc7a77f8674083050028c493ac601228 (diff) | |
| parent | 107b7d9fa94c4692d9104243f0e793e2a4e1366e (diff) | |
| download | linux-f842839cd85be149ff158bddf0260cd1a8db69e5.tar.bz2 | |
Merge tag 'mfd-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD fix from Lee Jones:
"Late bugfix to plug a leak in rtsx_pcr"
* tag 'mfd-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
mfd: rtsx: Release IRQ during shutdown
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/rtsx_pcr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c index 590fb9aad77d..c3ed885c155c 100644 --- a/drivers/mfd/rtsx_pcr.c +++ b/drivers/mfd/rtsx_pcr.c @@ -1543,6 +1543,9 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev) rtsx_pci_power_off(pcr, HOST_ENTER_S1); pci_disable_device(pcidev); + free_irq(pcr->irq, (void *)pcr); + if (pcr->msi_en) + pci_disable_msi(pcr->pci); } #else /* CONFIG_PM */ |