Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ufs: fix the and operator

Browse source 
Should use AND (&), not &&.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
This commit is contained in:
Haojian Zhuang 2017-06-12 22:18:15 +08:00
parent c396b7368a
commit 101afa02b7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/ufs/ufs.c
View file

@ -45,7 +45,7 @@ int ufshc_send_uic_cmd(uintptr_t base, uic_cmd_t *cmd)
data = mmio_read_32(base + IS); data = mmio_read_32(base + IS);
} while ((data & UFS_INT_UCCS) == 0); } while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS); 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) 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; return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0); } while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS); 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); assert(data == 0);
*val = mmio_read_32(base + UCMDARG3); *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; return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0); } while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS); 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); assert(data == 0);
return 0; return 0;
} }