lkml.org 
[lkml]   [2015]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 19/23] usb: gadget: configfs: add new composite API support
Date
Handle functions using new API properly.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
drivers/usb/gadget/configfs.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index d2101d8..fa5334f 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1424,6 +1424,11 @@ static int configfs_composite_bind(struct usb_gadget *gadget,
goto err_purge_funcs;
}
}
+
+ ret = usb_config_do_bind(c);
+ if (ret)
+ goto err_purge_funcs;
+
usb_ep_autoconfig_reset(cdev->gadget);
}
if (cdev->use_os_string) {
@@ -1432,10 +1437,23 @@ static int configfs_composite_bind(struct usb_gadget *gadget,
goto err_purge_funcs;
}

+ ret = composite_prep_vendor_descs(cdev);
+ if (ret < 0)
+ goto err_free_vendor_descs;
+
+ ret = composite_generate_old_descs(cdev);
+ if (ret < 0)
+ goto err_free_old_descs;
+
usb_ep_autoconfig_reset(cdev->gadget);
return 0;

+err_free_old_descs:
+ composite_free_old_descs(cdev);
+err_free_vendor_descs:
+ composite_free_vendor_descs(cdev);
err_purge_funcs:
+ composite_free_descs(cdev);
purge_configs_funcs(gi);
err_comp_cleanup:
composite_dev_cleanup(cdev);
@@ -1452,6 +1470,10 @@ static void configfs_composite_unbind(struct usb_gadget *gadget)
cdev = get_gadget_data(gadget);
gi = container_of(cdev, struct gadget_info, cdev);

+ composite_free_old_descs(cdev);
+ composite_free_vendor_descs(cdev);
+ composite_free_descs(cdev);
+
kfree(otg_desc[0]);
otg_desc[0] = NULL;
purge_configs_funcs(gi);
--
1.9.1


\
 
 \ /
  Last update: 2015-11-03 14:01    [W:1.686 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site