Merge tag 'mfd-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

torvalds · torvalds · commit f842839cd85b · 2018-01-05T12:56:20.000-08:00
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
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -1543,6 +1543,9 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)`
`1543`	`1543`	`rtsx_pci_power_off(pcr, HOST_ENTER_S1);`
`1544`	`1544`
`1545`	`1545`	`pci_disable_device(pcidev);`
	`1546`	`+ free_irq(pcr->irq, (void *)pcr);`
	`1547`	`+ if (pcr->msi_en)`
	`1548`	`+ pci_disable_msi(pcr->pci);`
`1546`	`1549`	`}`
`1547`	`1550`
`1548`	`1551`	`#else /* CONFIG_PM */`