Commit f37e9f8c authored by Yaniv Gardi's avatar Yaniv Gardi Committed by Martin K. Petersen

scsi: ufs: fix condition in which DME command failure msg is printed out

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: default avatarYaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fb7b45f0
...@@ -2516,10 +2516,10 @@ int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel, ...@@ -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); set, UIC_GET_ATTR_ID(attr_sel), mib_val, ret);
} while (ret && peer && --retries); } while (ret && peer && --retries);
if (!retries) if (ret)
dev_err(hba->dev, "%s: attr-id 0x%x val 0x%x failed %d retries\n", 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, set, UIC_GET_ATTR_ID(attr_sel), mib_val,
retries); UFS_UIC_COMMAND_RETRIES - retries);
return ret; return ret;
} }
...@@ -2583,9 +2583,10 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel, ...@@ -2583,9 +2583,10 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
get, UIC_GET_ATTR_ID(attr_sel), ret); get, UIC_GET_ATTR_ID(attr_sel), ret);
} while (ret && peer && --retries); } while (ret && peer && --retries);
if (!retries) if (ret)
dev_err(hba->dev, "%s: attr-id 0x%x failed %d retries\n", 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) if (mib_val && !ret)
*mib_val = uic_cmd.argument3; *mib_val = uic_cmd.argument3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment