summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2017-06-12 22:18:15 +0800
committerHaojian Zhuang <haojian.zhuang@linaro.org>2017-06-13 14:33:49 +0800
commit101afa02b71d1a09bb20ee84451cbbfa7ad6c5d0 (patch)
tree26a259f96730c1922a4f0be796b2992156a74162 /drivers
parentc396b7368a04e561e1f684797f541bfce8037241 (diff)
ufs: fix the and operator
Should use AND (&), not &&. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ufs/ufs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index dbfcd0ff..d513d0a5 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -45,7 +45,7 @@ int ufshc_send_uic_cmd(uintptr_t base, uic_cmd_t *cmd)
data = mmio_read_32(base + IS);
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
- return mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
+ return mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
}
int ufshc_dme_get(unsigned int attr, unsigned int idx, unsigned int *val)
@@ -77,7 +77,7 @@ int ufshc_dme_get(unsigned int attr, unsigned int idx, unsigned int *val)
return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
- data = mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
+ data = mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
assert(data == 0);
*val = mmio_read_32(base + UCMDARG3);
@@ -106,7 +106,7 @@ int ufshc_dme_set(unsigned int attr, unsigned int idx, unsigned int val)
return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
- data = mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
+ data = mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
assert(data == 0);
return 0;
}