1 files changed, 21 insertions, 17 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 3b7ad10497fe..f21e48b2e956 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3763,7 +3763,10 @@ static int megasas_init_fw(struct megasas_instance *instance)
 
         memset(instance->pd_list, 0 ,
                 (MEGASAS_MAX_PD * sizeof(struct megasas_pd_list)));
-        megasas_get_pd_list(instance);
+        if (megasas_get_pd_list(instance) < 0) {
+                printk(KERN_ERR "megasas: failed to get PD list\n");
+                goto fail_init_adapter;
+        }
 
         memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS);
         if (megasas_ld_list_query(instance,
@@ -5592,22 +5595,23 @@ megasas_aen_polling(struct work_struct *work)
 
         if (doscan) {
                 printk(KERN_INFO "scanning ...\n");
-                megasas_get_pd_list(instance);
-                for (i = 0; i < MEGASAS_MAX_PD_CHANNELS; i++) {
-                        for (j = 0; j < MEGASAS_MAX_DEV_PER_CHANNEL; j++) {
-                                pd_index = i*MEGASAS_MAX_DEV_PER_CHANNEL + j;
-                                sdev1 = scsi_device_lookup(host, i, j, 0);
-                                if (instance->pd_list[pd_index].driveState ==
-                                                        MR_PD_STATE_SYSTEM) {
-                                        if (!sdev1) {
-                                                scsi_add_device(host, i, j, 0);
-                                        }
-                                        if (sdev1)
-                                                scsi_device_put(sdev1);
-                                } else {
-                                        if (sdev1) {
-                                                scsi_remove_device(sdev1);
-                                                scsi_device_put(sdev1);
+                if (megasas_get_pd_list(instance) == 0) {
+                        for (i = 0; i < MEGASAS_MAX_PD_CHANNELS; i++) {
+                                for (j = 0; j < MEGASAS_MAX_DEV_PER_CHANNEL; j++) {
+                                        pd_index = i*MEGASAS_MAX_DEV_PER_CHANNEL + j;
+                                        sdev1 = scsi_device_lookup(host, i, j, 0);
+                                        if (instance->pd_list[pd_index].driveState ==
+                                            MR_PD_STATE_SYSTEM) {
+                                                if (!sdev1) {
+                                                        scsi_add_device(host, i, j, 0);
+                                                }
+                                                if (sdev1)
+                                                        scsi_device_put(sdev1);
+                                        } else {
+                                                if (sdev1) {
+                                                        scsi_remove_device(sdev1);
+                                                        scsi_device_put(sdev1);
+                                                }
                                         }
                                 }
                         }