NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: USB: gadget: core: adjust uevent timing on gadget unbind

Browse source 
The KOBJ_CHANGE uevent is sent before gadget unbind is actually
executed, resulting in inaccurate uevent emitted at incorrect timing
(the uevent would have USB_UDC_DRIVER variable set while it would
soon be removed).
Move the KOBJ_CHANGE uevent to the end of the unbind function so that
uevent is sent only after the change has been made.

Fixes: 2ccea03a8f ("usb: gadget: introduce UDC Class")
Cc: stable@vger.kernel.org
Signed-off-by: Roy Luo <royluo@google.com>
Link: https://lore.kernel.org/r/20231128221756.2591158-1-royluo@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 312543856
Change-Id: Ida7fa7e1cfae3d1b3f3348512a67fe91065f25af
(cherry picked from commit 73ea73affe8622bdf292de898da869d441da6a9d)
Signed-off-by: Roy Luo <royluo@google.com>
This commit is contained in:
Roy Luo 2023-11-28 22:17:56 +00:00 • committed by Treehugger Robot
parent d3006fb944
commit d16a15fde5
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/gadget/udc/core.c
View file

@ -1619,8 +1619,6 @@ static void gadget_unbind_driver(struct device *dev)
dev_dbg(&udc->dev, "unbinding gadget driver [%s]\n", driver->function); dev_dbg(&udc->dev, "unbinding gadget driver [%s]\n", driver->function);
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
udc->allow_connect = false; udc->allow_connect = false;
cancel_work_sync(&udc->vbus_work); cancel_work_sync(&udc->vbus_work);
mutex_lock(&udc->connect_lock); mutex_lock(&udc->connect_lock);
@ -1640,6 +1638,8 @@ static void gadget_unbind_driver(struct device *dev)
driver->is_bound = false; driver->is_bound = false;
udc->driver = NULL; udc->driver = NULL;
mutex_unlock(&udc_lock); mutex_unlock(&udc_lock);
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */