Commit 8e21a620 authored by Prashanth K's avatar Prashanth K Committed by Greg Kroah-Hartman
Browse files

usb: common: usb-conn-gpio: Prevent bailing out if initial role is none 



Currently if we bootup a device without cable connected, then
usb-conn-gpio won't call set_role() because last_role is same
as current role. This happens since last_role gets initialised
to zero during the probe.

To avoid this, add a new flag initial_detection into struct
usb_conn_info, which prevents bailing out during initial
detection.

Cc: <stable@vger.kernel.org> # 5.4
Fixes: 4602f3bf ("usb: common: add USB GPIO based connection detection driver")
Signed-off-by: default avatarPrashanth K <quic_prashk@quicinc.com>
Tested-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/1690880632-12588-1-git-send-email-quic_prashk@quicinc.com


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

drivers/usb/common/usb-conn-gpio.c

+5 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct usb_conn_info { 


	struct power_supply_desc desc;

	struct power_supply *charger;

	bool initial_detection;

};



/*
@@ -86,11 +87,13 @@ static void usb_conn_detect_cable(struct work_struct *work) 
	dev_dbg(info->dev, "role %s -> %s, gpios: id %d, vbus %d\n",

		usb_role_string(info->last_role), usb_role_string(role), id, vbus);



	if (info->last_role == role) {

	if (!info->initial_detection && info->last_role == role) {

		dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role));

		return;

	}



	info->initial_detection = false;



	if (info->last_role == USB_ROLE_HOST && info->vbus)

		regulator_disable(info->vbus);
@@ -258,6 +261,7 @@ static int usb_conn_probe(struct platform_device *pdev) 
	device_set_wakeup_capable(&pdev->dev, true);



	/* Perform initial detection */

	info->initial_detection = true;

	usb_conn_queue_dwork(info, 0);



	return 0;