1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 0c6c17a1c59e..ba2f6d1d7db7 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1329,6 +1329,9 @@ static pci_ers_result_t cxl_vphb_error_detected(struct cxl_afu *afu,
         /* There should only be one entry, but go through the list
          * anyway
          */
+        if (afu->phb == NULL)
+                return result;
+
         list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
                 if (!afu_dev->driver)
                         continue;
@@ -1369,6 +1372,10 @@ static pci_ers_result_t cxl_pci_error_detected(struct pci_dev *pdev,
                  */
                 for (i = 0; i < adapter->slices; i++) {
                         afu = adapter->afu[i];
+                        /*
+                         * Tell the AFU drivers; but we don't care what they
+                         * say, we're going away.
+                         */
                         cxl_vphb_error_detected(afu, state);
                 }
                 return PCI_ERS_RESULT_DISCONNECT;
@@ -1492,6 +1499,9 @@ static pci_ers_result_t cxl_pci_slot_reset(struct pci_dev *pdev)
                 if (cxl_afu_select_best_mode(afu))
                         goto err;
 
+                if (afu->phb == NULL)
+                        continue;
+
                 cxl_pci_vphb_reconfigure(afu);
 
                 list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
@@ -1556,6 +1566,9 @@ static void cxl_pci_resume(struct pci_dev *pdev)
         for (i = 0; i < adapter->slices; i++) {
                 afu = adapter->afu[i];
 
+                if (afu->phb == NULL)
+                        continue;
+
                 list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
                         if (afu_dev->driver && afu_dev->driver->err_handler &&
                             afu_dev->driver->err_handler->resume)