Message ID | 20200114094353.105298870@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=X/91=3D=vger.kernel.org=stable-owner@kernel.org> 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 DD7C0C33CB3 for <stable@archiver.kernel.org>; Tue, 14 Jan 2020 10:03:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B48842465B for <stable@archiver.kernel.org>; Tue, 14 Jan 2020 10:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996204; bh=pvOufZuphj6VLZXcaZb7RAaxRfAvsWGCvqjOw747ZXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s4TRvuvvC7KkQFP7nuAxd8SC3gi7zFMpEaNcyGO40T3inpVGUhnaNo5bM8K/ihRlW zm/ISCA6J7Xf86nDZih1LL01L8qaekjqYNcHYNI3QaZxgzPlRpMhGpMNPffa2nhWUF ysNW6QFRgo9y1Y4ETJ6M63gaiPTmTsK1/ca9SVkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729525AbgANKDY (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 14 Jan 2020 05:03:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:58224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729175AbgANKDX (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 14 Jan 2020 05:03:23 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 594B02467D; Tue, 14 Jan 2020 10:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996202; bh=pvOufZuphj6VLZXcaZb7RAaxRfAvsWGCvqjOw747ZXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SkqXaa7jDp6MRUvV2tjlLcVi60qJm5nDyH05m5JnHA5e3WWVad66fkO8eU8+SMRLw pgiRGAT5kWGC2gKPl4fDWA4OcvmBOIpy1wvjaNdTMA4bc8VtgV3oQbW3OnrPp9xHbW mz2zQC1ac26Cs8XSqrM6cKkForayv+qGlb/SBajQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Michael Grzeschik <m.grzeschik@pengutronix.de>, Peter Chen <peter.chen@freescale.com>, Guenter Roeck <linux@roeck-us.net>, Peter Chen <peter.chen@nxp.com> Subject: [PATCH 5.4 04/78] usb: chipidea: host: Disable port power only if previously enabled Date: Tue, 14 Jan 2020 11:00:38 +0100 Message-Id: <20200114094353.105298870@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094352.428808181@linuxfoundation.org> References: <20200114094352.428808181@linuxfoundation.org> User-Agent: quilt/0.66 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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -26,6 +26,7 @@ static int (*orig_bus_suspend)(struct us struct ehci_ci_priv { struct regulator *reg_vbus; + bool enabled; }; static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable) @@ -37,7 +38,7 @@ static int ehci_ci_portpower(struct usb_ int ret = 0; int port = HCS_N_PORTS(ehci->hcs_params); - if (priv->reg_vbus) { + if (priv->reg_vbus && enable != priv->enabled) { if (port > 1) { dev_warn(dev, "Not support multi-port regulator control\n"); @@ -53,6 +54,7 @@ static int ehci_ci_portpower(struct usb_ enable ? "enable" : "disable", ret); return ret; } + priv->enabled = enable; } if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {