diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-05 11:20:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-05 11:20:30 -0400 |
| commit | 6194b45a83bde42cd2f404123823e5b326702001 (patch) | |
| tree | eef0284dfb378d20ee3a21577d3f7abb4f127fd5 /arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | |
| parent | 840658b093976390e9537724f802281c9c8439f5 (diff) | |
| parent | 03b61ffe5a780d6e8301df16e4e60b3dcd1d0b66 (diff) | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c index bc44d9fc8f9..d4a3f7ea16f 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c @@ -207,13 +207,10 @@ bool stm32prog_usb_loop(struct stm32prog_data *data, int dev) if (stm32prog_data->phase == PHASE_FLASHLAYOUT) { ret = run_usb_dnl_gadget(dev, "usb_dnl_dfu"); - if (ret || stm32prog_data->phase == PHASE_DO_RESET) + if (ret || stm32prog_data->phase != PHASE_FLASHLAYOUT) return ret; /* prepare the second enumeration with the FlashLayout */ - if (stm32prog_data->phase == PHASE_FLASHLAYOUT) - stm32prog_dfu_init(data); - /* found next selected partition */ - stm32prog_next_phase(data); + stm32prog_dfu_init(data); } ret = run_usb_dnl_gadget(dev, "usb_dnl_dfu"); |