We should check msi_irq before calling irq_set_chained_handler() and
irq_set_handler_data().

Signed-off-by: Jisheng Zhang <jisheng.zh...@synaptics.com>
Acked-by: Gustavo Pimentel <gustavo.pimen...@synopsys.com>
---
 drivers/pci/controller/dwc/pcie-designware-host.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c 
b/drivers/pci/controller/dwc/pcie-designware-host.c
index 25087d3c9a82..1040939f45b4 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -298,8 +298,10 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)
 
 void dw_pcie_free_msi(struct pcie_port *pp)
 {
-       irq_set_chained_handler(pp->msi_irq, NULL);
-       irq_set_handler_data(pp->msi_irq, NULL);
+       if (pp->msi_irq) {
+               irq_set_chained_handler(pp->msi_irq, NULL);
+               irq_set_handler_data(pp->msi_irq, NULL);
+       }
 
        irq_domain_remove(pp->msi_domain);
        irq_domain_remove(pp->irq_domain);
-- 
2.20.1

Reply via email to