scsi: ufs: fix condition in which DME command failure msg is printed out
authorYaniv Gardi <ygardi@codeaurora.org>
Thu, 24 Nov 2016 00:32:49 +0000 (16:32 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 29 Nov 2016 17:06:57 +0000 (12:06 -0500)
The condition in which error message is printed out was incorrect and
resulted error message only if retries exhausted.
But retries happens only if DME command is a peer command, and thus
DME commands which are not peer commands and fail are not printed out.
This change fixes this issue.

Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index ec4c99ab6a915aea6155f7d0ca54d4e7e5d34896..b82607856607bdf4e258639cdc4fe75da133bff3 100644 (file)
@@ -2516,10 +2516,10 @@ int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel,
                                set, UIC_GET_ATTR_ID(attr_sel), mib_val, ret);
        } while (ret && peer && --retries);
 
-       if (!retries)
+       if (ret)
                dev_err(hba->dev, "%s: attr-id 0x%x val 0x%x failed %d retries\n",
-                               set, UIC_GET_ATTR_ID(attr_sel), mib_val,
-                               retries);
+                       set, UIC_GET_ATTR_ID(attr_sel), mib_val,
+                       UFS_UIC_COMMAND_RETRIES - retries);
 
        return ret;
 }
@@ -2583,9 +2583,10 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
                                get, UIC_GET_ATTR_ID(attr_sel), ret);
        } while (ret && peer && --retries);
 
-       if (!retries)
+       if (ret)
                dev_err(hba->dev, "%s: attr-id 0x%x failed %d retries\n",
-                               get, UIC_GET_ATTR_ID(attr_sel), retries);
+                       get, UIC_GET_ATTR_ID(attr_sel),
+                       UFS_UIC_COMMAND_RETRIES - retries);
 
        if (mib_val && !ret)
                *mib_val = uic_cmd.argument3;