summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Li <jun.li@nxp.com>2018-08-03 09:34:50 -0500
committerJun Li <jun.li@nxp.com>2018-08-03 09:51:13 -0500
commit73187a06aac3a82b05b722f68c717a370c8a9fdd (patch)
tree1e1d541966f1731d3641e130c762ebc03575841b
parentd4ccaa7c87576a5a9a246ee89a627dd8efd8ae07 (diff)
MLK-19101 usb: gadget: update os_desc_config when add config
Always use the new added config for os_desc_config to fix cdev-> os_desc_config may miss set in case we restart usb gadget driver. Signed-off-by: Li Jun <jun.li@nxp.com> (cherry picked from commit e8efb32e9b7a4fe45c7f21e86052c7f5bcdb6695)
-rw-r--r--drivers/usb/gadget/composite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 4d5c8314ea..31daa96b9c 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -502,8 +502,8 @@ int usb_add_config(struct usb_composite_dev *cdev,
usb_ep_autoconfig_reset(cdev->gadget);
- if (os_desc_config)
- cdev->os_desc_config = os_desc_config;
+ os_desc_config = config;
+ cdev->os_desc_config = os_desc_config;
done:
if (status)