Commit 2adc960c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG ->... 


Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""

This reverts commit 8bd6b8c4.

Prerequisite revert for the reverting of the original commit 0f010171.

Fixes: 8bd6b8c4 ("USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"")
Fixes: 0f010171 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")
Reported-by: default avatarFerry Toth <fntoth@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com> # for Merrifield
Link: https://lore.kernel.org/r/20220927155332.10762-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb87c979

drivers/usb/dwc3/core.c

+7 −2
Original line number Diff line number Diff line
@@ -1707,8 +1707,13 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) 
	 * This device property is for kernel internal use only and

	 * is expected to be set by the glue code.

	 */

	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)

		return extcon_get_extcon_dev(name);

	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {

		edev = extcon_get_extcon_dev(name);

		if (!edev)

			return ERR_PTR(-EPROBE_DEFER);



		return edev;

	}



	/*

	 * Try to get an extcon device from the USB PHY controller's "port"