1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 2c6bf74ad5c1..ecada419809c 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -461,6 +461,9 @@ static void process_queued_ios(struct work_struct *work)
                 m->pg_init_count++;
                 m->pg_init_required = 0;
                 list_for_each_entry(tmp, &pgpath->pg->pgpaths, list) {
+                        /* Skip failed paths */
+                        if (!tmp->is_active)
+                                continue;
                         if (queue_work(kmpath_handlerd, &tmp->activate_path))
                                 m->pg_init_in_progress++;
                 }
@@ -1142,8 +1145,8 @@ static void pg_init_done(void *data, int errors)
                         errors = 0;
                         break;
                 }
-                DMERR("Cannot failover device because scsi_dh_%s was not "
-                      "loaded.", m->hw_handler_name);
+                DMERR("Could not failover the device: Handler scsi_dh_%s "
+                      "Error %d.", m->hw_handler_name, errors);
                 /*
                  * Fail path for now, so we do not ping pong
                  */