Commit 8bd6b8c4 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Greg Kroah-Hartman
Browse files

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



Today's linux-next merge of the extcon tree got a conflict in:

  drivers/usb/dwc3/drd.c

between commit:

  0f010171 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")

from the usb tree and commit:

  88490c7f43c4 ("extcon: Fix extcon_get_extcon_dev() error handling")

from the extcon tree.

I fixed it up (the former moved the code modified by the latter, so I
used the former version of this files and added the following merge fix
patch) and can carry the fix as necessary.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20220426152739.62f6836e@canb.auug.org.au


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

drivers/usb/dwc3/core.c

+2 −7
Original line number Diff line number Diff line
@@ -1644,13 +1644,8 @@ 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) {

		edev = extcon_get_extcon_dev(name);

		if (!edev)

			return ERR_PTR(-EPROBE_DEFER);



		return edev;

	}

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

		return extcon_get_extcon_dev(name);



	/*

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