diff --git a/[refs] b/[refs] index 853903c09d23..9b69d3a926f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cacf72922067271ee2ad4debc398a53aeaf8a41 +refs/heads/master: dabe6e694685150b25ff357e1ef401b96ab81ec3 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index 6a4681742ce2..7942143c554e 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -105,9 +105,9 @@ static void sep_load_rom_code(struct sep_device *sep) sep_write_reg(sep, HW_HOST_SEP_SW_RST_REG_ADDR, 0x1); /* poll for SEP ROM boot finish */ - do { + do reg = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR); - } while (!reg); + while (!reg); edbg("SEP Driver: ROM polling ended\n"); @@ -117,31 +117,18 @@ static void sep_load_rom_code(struct sep_device *sep) error = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); edbg("SEP Driver: ROM polling case 1\n"); break; - case 0x2: - /* Boot First Phase ended */ - warning = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); - edbg("SEP Driver: ROM polling case 2\n"); - break; case 0x4: /* Cold boot ended successfully */ - warning = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); - edbg("SEP Driver: ROM polling case 4\n"); - error = 0; - break; case 0x8: /* Warmboot ended successfully */ - warning = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); - edbg("SEP Driver: ROM polling case 8\n"); - error = 0; - break; case 0x10: /* ColdWarm boot ended successfully */ - warning = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); - edbg("SEP Driver: ROM polling case 16\n"); error = 0; - break; + case 0x2: + /* Boot First Phase ended */ + warning = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR0_REG_ADDR); case 0x20: - edbg("SEP Driver: ROM polling case 32\n"); + edbg("SEP Driver: ROM polling case %d\n", reg); break; }