diff options
| author | Tom Rini <trini@ti.com> | 2012-12-21 16:19:29 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-21 16:19:29 -0700 |
| commit | ba6d4b64b33146740a15b3dd5a5f511a2bc8d6f6 (patch) | |
| tree | c57eeb10d2b625a1052cb523e6dd53d067b1bb65 /drivers | |
| parent | ba427678a419a59c091e1c816c13852fa05b24bf (diff) | |
| parent | 41984e71231c7af4a5617f4f94f372714c64d987 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/g_dnl.c | 12 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 7d87050df3d..a5a4c1fe65f 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -69,6 +69,7 @@ static struct usb_device_descriptor device_desc = { static struct usb_string g_dnl_string_defs[] = { { 0, manufacturer, }, { 1, product, }, + { } /* end of list */ }; static struct usb_gadget_strings g_dnl_string_tab = { @@ -83,7 +84,12 @@ static struct usb_gadget_strings *g_dnl_composite_strings[] = { static int g_dnl_unbind(struct usb_composite_dev *cdev) { - debug("%s\n", __func__); + struct usb_gadget *gadget = cdev->gadget; + + debug("%s: calling usb_gadget_disconnect for " + "controller '%s'\n", shortname, gadget->name); + usb_gadget_disconnect(gadget); + return 0; } @@ -153,6 +159,10 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); } + debug("%s: calling usb_gadget_connect for " + "controller '%s'\n", shortname, gadget->name); + usb_gadget_connect(gadget); + return 0; error: diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index dd741439aea..9ce98f07684 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -40,7 +40,6 @@ #include <asm/io.h> #include <asm/arch/pxa.h> -#include <usbdescriptors.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <usb/lin_gadget_compat.h> |