diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
| commit | 51fa228c8e05c58f51c97bbc571be94c4592a85e (patch) | |
| tree | 494028747238cf9edb0f6187f1bfaeccc762ceb0 /drivers/usb/typec/ucsi | |
| parent | dt-bindings: usb: renesas_gen3: Rename bindings documentation file to reflect IP block (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-51fa228c8e05c58f51c97bbc571be94c4592a85e.tar.xz linux-dev-51fa228c8e05c58f51c97bbc571be94c4592a85e.zip | |
Merge 5.3-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/ucsi')
| -rw-r--r-- | drivers/usb/typec/ucsi/ucsi_ccg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index e283a42e4f06..907e20e1a71e 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -1018,7 +1018,7 @@ release_fw: ******************************************************************************/ static int ccg_fw_update(struct ucsi_ccg *uc, enum enum_flash_mode flash_mode) { - int err; + int err = 0; while (flash_mode != FLASH_NOT_NEEDED) { err = do_flash(uc, flash_mode); |