Commit dd796e92 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kishon Vijay Abraham I

phy: rockchip-inno-usb2: fix uninitialized tmout variable

The newly added OTG support has an obvious uninitialized variable
access that gcc warns about:

drivers/phy/phy-rockchip-inno-usb2.c: In function 'rockchip_chg_detect_work':
drivers/phy/phy-rockchip-inno-usb2.c:717:7: error: 'tmout' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This replaces the use of the uninitialized variable with what
the value was in the previous USB_CHG_STATE_WAIT_FOR_DCD
state.

Fixes: 0c42fe48fd23 ("phy: rockchip-inno-usb2: support otg-port for rk3399")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 9d052aa0
...@@ -714,7 +714,7 @@ static void rockchip_chg_detect_work(struct work_struct *work) ...@@ -714,7 +714,7 @@ static void rockchip_chg_detect_work(struct work_struct *work)
delay = CHG_SECONDARY_DET_TIME; delay = CHG_SECONDARY_DET_TIME;
rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE; rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE;
} else { } else {
if (tmout) { if (rphy->dcd_retries == CHG_DCD_MAX_RETRIES) {
/* floating charger found */ /* floating charger found */
rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP; rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP;
rphy->chg_state = USB_CHG_STATE_DETECTED; rphy->chg_state = USB_CHG_STATE_DETECTED;
......
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