PCI: aerdrv: rework add_error_device

Stop iteration if we cannot register any more.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 13 insertions, 5 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index f8ffa47503b7..f5eb69f532e7 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -99,18 +99,21 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);
 
+/**
+ * add_error_device - list device to be handled
+ * @e_info: pointer to error info
+ * @dev: pointer to pci_dev to be added
+ */
 static int add_error_device(struct aer_err_info *e_info, struct pci_dev *dev)
 {
         if (e_info->error_dev_num < AER_MAX_MULTI_ERR_DEVICES) {
                 e_info->dev[e_info->error_dev_num] = dev;
                 e_info->error_dev_num++;
-                return 1;
+                return 0;
         }
-
-        return 0;
+        return -ENOSPC;
 }
 
-
 #define PCI_BUS(x)      (((x) >> 8) & 0xff)
 
 /**
@@ -183,7 +186,12 @@ static int find_device_iter(struct pci_dev *dev, void *data)
         struct aer_err_info *e_info = (struct aer_err_info *)data;
 
         if (is_error_source(dev, e_info)) {
-                add_error_device(e_info, dev);
+                /* List this device */
+                if (add_error_device(e_info, dev)) {
+                        /* We cannot handle more... Stop iteration */
+                        /* TODO: Should print error message here? */
+                        return 1;
+                }
 
                 /* If there is only a single error, stop iteration */
                 if (!e_info->multi_error_valid)