From 101afa02b71d1a09bb20ee84451cbbfa7ad6c5d0 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@linaro.org>
Date: Mon, 12 Jun 2017 22:18:15 +0800
Subject: [PATCH] ufs: fix the and operator

Should use AND (&), not &&.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
 drivers/ufs/ufs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index dbfcd0ff5..d513d0a55 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;
 }
-- 
GitLab