From patchwork Wed Nov 16 14:22:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9431713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A605060469 for ; Wed, 16 Nov 2016 14:25:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 962E428910 for ; Wed, 16 Nov 2016 14:25:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89E8428F10; Wed, 16 Nov 2016 14:25:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2264928910 for ; Wed, 16 Nov 2016 14:25:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c717q-0003Ok-Lw; Wed, 16 Nov 2016 14:23:46 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c717i-0003LG-B5; Wed, 16 Nov 2016 14:23:39 +0000 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MT82Y-1cFAJM0eeM-00SBNT; Wed, 16 Nov 2016 15:23:02 +0100 From: Arnd Bergmann To: Kishon Vijay Abraham I Subject: [PATCH 1/2] phy: rockchip-inno-usb2: fix uninitialized tmout variable Date: Wed, 16 Nov 2016 15:22:38 +0100 Message-Id: <20161116142259.2123506-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:bgIS139WyZ7Goqs8kOlJ0bKzDA4eBXRvgB4rYsQwZFAUBiWnzNo 7knHhET2GNvuhnC/DUetGc9M/SjLUrSzPxf2c85GwlK+RSNmxdVrcKYI2MtvZKpebdf6Tlq GxsIXWsyzGD62ThqbHCmWWjsOovi4TpyLv2BLnTASyw/LBxTrXkALLCbACMyZF9A0QPL2gD ZoccrO1h/Ox5QO2Cw4l2Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:FcjFL18RT+4=:x6e5qYgWKmYtjxVD8jyLqw lmypGagl/W6zWqzZmmLxDrSdOakIwI0J/6ewcmZmPOQK1Oy5ijn3bizUYICaNL3V80l9ar0P8 plRwrK5il20O/YwC4YMZAej8ssKfJv7suCV643vnj1PmxgXbf2jogbQksHz1VI0FTu/Gh0BUc LNLJSlUwNX+Nq9QNnsW4UslQ5L1mMe8udtfBgdBpiUHDd6iLXrDdxCC7jPKDX0qV5Tmws5mPM XDWM2WmGdMF1rjAbgALQfn1yuto1vQ5yFJ4+f7WP9Wj2jD/rgplJcSgzsC0cb6v7lbK/WWXUq iA0BHTkYZ+Fb/hxRBe4jeSULGOYRCKwvzanupef5sCZc3JP2Q6qKZ1oJz7SZc0SvI9IUepmEW prm3WSJBdM7TIIDm9rWwABrbWckWEt8nAK6t/PONFM1uQgxm93uo1JSoxGo5ZQ8MO8m6nnms1 xpdk3030lU2gRcr93WiiAOmy+b31RuduMVZpGI3QXlLNRR1I+DI8EOcuPIXKDCU6moBoGxi+Z QUKIOPOgmq67kl678qmZm/uwbhyHjD9jPp+7L/5bTLkSLl5mU/Hmnr9gVdHdPw+698a8sRYaM Xa/nt1HBfW+sj3OGSW21rZNBGA9K4FPZdvA2CwVA9yeVJKN4k3VSRyRJq3wUFgggjyyosVN1Z pDde0Tq0wFFAifgR5XOROAwUwSKXGPc+S/oSFExSNFctQ0HDCLczBxRdpX3K2HmXqPBw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161116_062338_807149_E87D498F X-CRM114-Status: GOOD ( 10.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Arnd Bergmann , Frank Wang , linux-kernel@vger.kernel.org, Douglas Anderson , linux-rockchip@lists.infradead.org, William Wu , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: William Wu --- drivers/phy/phy-rockchip-inno-usb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c index eb89de59b68f..2f99ec95079c 100644 --- a/drivers/phy/phy-rockchip-inno-usb2.c +++ b/drivers/phy/phy-rockchip-inno-usb2.c @@ -714,7 +714,7 @@ static void rockchip_chg_detect_work(struct work_struct *work) delay = CHG_SECONDARY_DET_TIME; rphy->chg_state = USB_CHG_STATE_PRIMARY_DONE; } else { - if (tmout) { + if (rphy->dcd_retries == CHG_DCD_MAX_RETRIES) { /* floating charger found */ rphy->chg_type = POWER_SUPPLY_TYPE_USB_DCP; rphy->chg_state = USB_CHG_STATE_DETECTED;