Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

authored by

Arnd Bergmann and committed by
Kishon Vijay Abraham I
dd796e92 9d052aa0

+1 -1
+1 -1
drivers/phy/phy-rockchip-inno-usb2.c
··· 714 714 delay = CHG_SECONDARY_DET_TIME; 715 715 rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE; 716 716 } else { 717 - if (tmout) { 717 + if (rphy->dcd_retries == CHG_DCD_MAX_RETRIES) { 718 718 /* floating charger found */ 719 719 rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP; 720 720 rphy->chg_state = USB_CHG_STATE_DETECTED;