Skip to content

GitLab

Commit fa792637 authored by danh-arm's avatar danh-arm Committed by GitHub
Browse files

Merge pull request #956 from hzhuang1/fix_var_in_ddr 

hikey: fix uninitialized variable in ddr code
parents 572e1413 22db0167
Hide whitespace changes
Inline Side-by-side
plat/hisilicon/hikey/hikey_ddr.c
View file @ fa792637
...@@ -385,7 +385,7 @@ static void ddrx_rdet(void) ...@@ -385,7 +385,7 @@ static void ddrx_rdet(void)
static void ddrx_wdet(void) static void ddrx_wdet(void)
{ {
unsigned int data, wdet, zero_bdl, dq[4]; unsigned int data, wdet, zero_bdl = 0, dq[4];
int i; int i;
data = mmio_read_32((0xf712c000 + 0x0d0)); data = mmio_read_32((0xf712c000 + 0x0d0));
...@@ -454,11 +454,11 @@ static void ddrx_wdet(void) ...@@ -454,11 +454,11 @@ static void ddrx_wdet(void)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
data = mmio_read_32((0xf712c000 + 0x210 + i * 0x80)); data = mmio_read_32((0xf712c000 + 0x210 + i * 0x80));
if ((!(data & 0x1f)) || (!(data & 0x1f00)) || if ((!(data & 0x1f)) || (!(data & 0x1f00)) ||
(!(data & 0x1f0000)) || (!(data & 0x1f000000))) (!(data & 0x1f0000)) || (!(data & 0x1f000000)))
zero_bdl = 1; zero_bdl = 1;
data = mmio_read_32((0xf712c000 + 0x214 + i * 0x80)); data = mmio_read_32((0xf712c000 + 0x214 + i * 0x80));
if ((!(data & 0x1f)) || (!(data & 0x1f00)) || if ((!(data & 0x1f)) || (!(data & 0x1f00)) ||
(!(data & 0x1f0000)) || (!(data & 0x1f000000))) (!(data & 0x1f0000)) || (!(data & 0x1f000000)))
zero_bdl = 1; zero_bdl = 1;
data = mmio_read_32((0xf712c000 + 0x218 + i * 0x80)); data = mmio_read_32((0xf712c000 + 0x218 + i * 0x80));
if (!(data & 0x1f)) if (!(data & 0x1f))
......
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