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

Commit c65e477f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: composite: Update usb_core_id with composite driver"

parents 3a02bffa b20290db

drivers/usb/gadget/composite.c

+7 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,7 @@ static const struct usb_gadget_driver composite_driver_template = { 
int usb_composite_probe(struct usb_composite_driver *driver)

{

	struct usb_gadget_driver *gadget_driver;

	u8 core_id;



	if (!driver || !driver->dev || !driver->bind)

		return -EINVAL;
@@ -1835,6 +1836,7 @@ int usb_composite_probe(struct usb_composite_driver *driver) 
	if (!driver->name)

		driver->name = "composite";



	core_id = driver->gadget_driver.usb_core_id;

	driver->gadget_driver = composite_driver_template;

	gadget_driver = &driver->gadget_driver;
@@ -1842,6 +1844,11 @@ int usb_composite_probe(struct usb_composite_driver *driver) 
	gadget_driver->driver.name = driver->name;

	gadget_driver->max_speed = driver->max_speed;



	if (core_id)

		gadget_driver->usb_core_id = core_id;



	pr_debug("%s(): gadget_driver->usb_core_id:%d\n", __func__,

					gadget_driver->usb_core_id);

	return usb_gadget_probe_driver(gadget_driver);

}

EXPORT_SYMBOL_GPL(usb_composite_probe);