Merge "usb: phy: snps: Return error if driver fails to enable power" (0e75f950) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/usb/phy/phy-msm-snps-hs.c

+7 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -280,6 +280,12 @@ static int msm_hsphy_enable_power(struct msm_hsphy *phy, bool on)
		if (ret)
		dev_err(phy->phy.dev, "Unable unconfig VDD:%d\n",
		ret);
		/* Return from here based on power_enabled. If it is not set
		* then return -EINVAL since either set_voltage or
		* regulator_enable failed
		*/
		if (!phy->power_enabled)
		return -EINVAL;
		err_vdd:
		phy->power_enabled = false;
		dev_dbg(phy->phy.dev, "HSUSB PHY's regulators are turned OFF.\n");