Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Sean Anderson <sean.anderson@seco.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org
Cc:     Robert Jarzmik <robert.jarzmik@free.fr>,
        Felipe Balbi <balbi@kernel.org>, linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH 4/4] usb: phy: generic: Disable vbus on removal
Date:   Fri, 14 Jan 2022 12:09:41 -0500
Message-Id: <20220114170941.800068-5-sean.anderson@seco.com>
In-Reply-To: <20220114170941.800068-1-sean.anderson@seco.com>
References: <20220114170941.800068-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?e/EhR1Y8j28LHX0eCGuZhFc5aIKTCnaJXaJyV3L9+/LCe0G3q5tqe7qnDyfe?=
 =?us-ascii?Q?53UEK9Bjv1HeZMdE6MgY71De84NHhJyaXTuCJShe2Y3RPhRZrpBpOyXIS1zS?=
 =?us-ascii?Q?GP9T57CHpTI5ijKAwEgoIOQ1OEvEbfSyMNoUqGNWs9mjNUMn2iIF8VsAMgm/?=
 =?us-ascii?Q?Efm/XGKrJPkPvbVI+8EC8JH4f9F8l3w9jSkw7Q8t5i5w4gcb6fAyvX5NwiWW?=
 =?us-ascii?Q?8shZceCpEpPBXiSMz13j3qQpVsUIFj3hVoUACvc8/KZRX2Ui29FVkIF2NyoX?=
 =?us-ascii?Q?mO8+tdHcMOIftrHBQv7lh71cI20u13bac5D39+n4id7f5eMLYl/JQjnuRGgp?=
 =?us-ascii?Q?HG0xWGwQ1PvtO5rlu3yoDLFTSFkVayk97vTmnziXdRouOeGiGSY08PG3E84D?=
 =?us-ascii?Q?v7FPo1Pi186gLL3qh44us6eVthFjmVGLhMtFqxsLuRP/pmnLxEF0q4M5WAlR?=
 =?us-ascii?Q?SOid3ANMi0K11OqibqkA9ul3Py77LNcVY6+1FYihmonB/sq/nXQ0tcgb5SvY?=
 =?us-ascii?Q?3sDy51DXdV5YhLfkeQfSmU05Ci0zxYYCdbcOYivRhtPMEjaNLfduXB9BhWHz?=
 =?us-ascii?Q?d2y8uUQ2RiyQsRQiu6t3Tdpp4IqjA1n0JXFAMyhB02ydJHU4MqLgNc2vRrXu?=
 =?us-ascii?Q?7iZDesk7feQ+A3f8fyhWvOK4sPOI2QZydBAkeb7kU1rC7H3yDf2nGh04Dw3b?=
 =?us-ascii?Q?dK6dfB243RTWGu4+Agam++J6kOO8Ea73FkkLPkZ/hRjm25dTkSldi26hPf2X?=
 =?us-ascii?Q?BmJd3Vyk8r+T3AvCN9lM+fmiaRz2p+AGpE9tSzQGI4mZFMBMDqZGKwbDa5sg?=
 =?us-ascii?Q?H7B24FXUhJVTO2qcg9Bdv4+1sEyAwNmAtFLLyiUCXEKsnfcld3s9kH67y7h3?=
 =?us-ascii?Q?k9XmrHKHIEW7x+FmpOY2or6tBbJI0XcGZwVrzWYWOjSeG5MTyP4H/UrIdjy9?=
 =?us-ascii?Q?FgEjvhocjH3/W9PRdTG6ulQKgAJVGVrnuN1kJ0SZIkmmHKOAO+LWwCWFTxOy?=
 =?us-ascii?Q?Uuj5caMnHi3uuUFBX8IMhjxu3tqLmh5QUrHci3qwgutidbxZSR+Gs7WnkEEi?=
 =?us-ascii?Q?/DnQAjjRMbqr6mWEDyPNeWTnjNtilUtizc1iJmxJ116mwvedTvGG6QZLHg8f?=
 =?us-ascii?Q?RqIvquj0qhIKPDdyB40paSKD41OY09zyenl3koOYcDknECYznpm8P4id6GCU?=
 =?us-ascii?Q?pkmKzQbsX0lVxQCG2hn25rG/rbkIcUxQU5IAFJA2TrMsIdcsHpZJMPOSwcxf?=
 =?us-ascii?Q?rysty5DN5ETe4QD2uAhGAUaf7jG9dtQxUFn4yajoRUqxNLUbOmDD6ExW65t2?=
 =?us-ascii?Q?+u3EQyiW+jFUKlFnBu9TJsapSyqOM8H5oFRqqnlRfE72X9GtUrKSHTpFTGkd?=
 =?us-ascii?Q?s9xRMqguo93MxfM1njAFhx78oqIMZy1YZ/xfy6q8SHEhlJwrkoCDQqrYVX1Y?=
 =?us-ascii?Q?oJrF0n76tx55V9w0R1K/UyVZbZ793djhblNjpYdctwiA2khx6nR+BjUxuLM7?=
 =?us-ascii?Q?E/+B76kKoMfvezI6mrlxgqrg6F3kAZIEiwU4/QIXTk817/7s3uF/aDBxH55v?=
 =?us-ascii?Q?HMtlicrM5f84vDSSvGv4iruKRtZ/PwXVx4WB/cWNXGHKZAagSzH8/8LbXIjn?=
 =?us-ascii?Q?BeAFeFzMp+eVsZ86U7zVvAw=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb456975-0426-4e30-9175-08d9d780b134
X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2022 17:09:58.0308
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Itu2jtuNspANGKT8+bDnQbAPan/yQoEsnz+kLsyPg11PJM8cpWWoGt8no891tr1qiHT+TzA+bBNAiX723onmpw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB7742
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If we enabled vbus, we need to balance that with a disable.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

 drivers/usb/phy/phy-generic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 2c2553bc9b54..9fc3312d614a 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -328,6 +328,9 @@ static int usb_phy_generic_remove(struct platform_device *pdev)
 
 	usb_remove_phy(&nop->phy);
 
+	if (nop->vbus_draw && nop->vbus_draw_enabled)
+		regulator_disable(nop->vbus_draw);
+
 	return 0;
 }
 
-- 
2.25.1