From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8B14C282CE for ; Mon, 11 Feb 2019 15:53:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8775821855 for ; Mon, 11 Feb 2019 15:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900383; bh=6ONwM5jc09VvTP0hGZEfUBlta5HYtxspVyFlDlbYsz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=haw4wZgF8dR85H18YBJHUfQgsDVn35gXN+SHkBnjJj41VR9Qk/A1ye4SQEoPYKMir X2Ch400ZsGexRxMAMvuknMiGB9a8YeYGyAbD86YGHYALa0yLccCY0Efjkssk+ccP0/ 6Ztagr7hshgSA4PIVkVOqSwWfnOypFRb0Iby76og= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729567AbfBKPw5 (ORCPT ); Mon, 11 Feb 2019 10:52:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:46146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729891AbfBKOgx (ORCPT ); Mon, 11 Feb 2019 09:36:53 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7C16C2081B; Mon, 11 Feb 2019 14:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895813; bh=6ONwM5jc09VvTP0hGZEfUBlta5HYtxspVyFlDlbYsz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=thyhgax1vD+si98cV9Y4oi4+ZT5ek7dgDktPGLbIDZ9g7UCpWpvL2asYAfbrurbok On20U7NrB3QxBx6ZAzMIwW/uJxsmNnZUjoIdZVe/nCf1isBHcoMwJ7LP2p4nsoFet8 pVsf2K/xE94+b/s4EDRSOhsfN+tDUUw/nev71LtE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bin Liu , Felipe Balbi Subject: [PATCH 4.20 331/352] usb: phy: am335x: fix race condition in _probe Date: Mon, 11 Feb 2019 15:19:18 +0100 Message-Id: <20190211141908.003076691@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bin Liu commit a53469a68eb886e84dd8b69a1458a623d3591793 upstream. power off the phy should be done before populate the phy. Otherwise, am335x_init() could be called by the phy owner to power on the phy first, then am335x_phy_probe() turns off the phy again without the caller knowing it. Fixes: 2fc711d76352 ("usb: phy: am335x: Enable USB remote wakeup using PHY wakeup") Cc: stable@vger.kernel.org # v3.18+ Signed-off-by: Bin Liu Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/phy/phy-am335x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/usb/phy/phy-am335x.c +++ b/drivers/usb/phy/phy-am335x.c @@ -61,9 +61,6 @@ static int am335x_phy_probe(struct platf if (ret) return ret; - ret = usb_add_phy_dev(&am_phy->usb_phy_gen.phy); - if (ret) - return ret; am_phy->usb_phy_gen.phy.init = am335x_init; am_phy->usb_phy_gen.phy.shutdown = am335x_shutdown; @@ -82,7 +79,7 @@ static int am335x_phy_probe(struct platf device_set_wakeup_enable(dev, false); phy_ctrl_power(am_phy->phy_ctrl, am_phy->id, am_phy->dr_mode, false); - return 0; + return usb_add_phy_dev(&am_phy->usb_phy_gen.phy); } static int am335x_phy_remove(struct platform_device *pdev)