Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14254212 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 



commit 8e21a620c7e6e00347ade1a6ed4967b359eada5a upstream.

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 25038d3f

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ struct usb_conn_info { 
	struct gpio_desc *vbus_gpiod;

	struct gpio_desc *vbus_gpiod;

	int id_irq;

	int id_irq;

	int vbus_irq;

	int vbus_irq;

	bool initial_detection;

};

};





/**

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

	dev_dbg(info->dev, "role %d/%d, gpios: id %d, vbus %d\n",

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

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





	if (info->last_role == role) {

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

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

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

		return;

		return;

	}

	}





	info->initial_detection = false;



	if (info->last_role == USB_ROLE_HOST)

	if (info->last_role == USB_ROLE_HOST)

		regulator_disable(info->vbus);

		regulator_disable(info->vbus);
@@ -206,6 +209,7 @@ static int usb_conn_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, info);

	platform_set_drvdata(pdev, info);





	/* Perform initial detection */

	/* Perform initial detection */

	info->initial_detection = true;

	usb_conn_queue_dwork(info, 0);

	usb_conn_queue_dwork(info, 0);





	return 0;

	return 0;