From 4231ae08db5888ed43b003f01573b68a1828e300 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Wed, 18 Jan 2012 17:06:03 +0200 Subject: [PATCH] --- yaml --- r: 289613 b: refs/heads/master c: 40aa41fba348bc5bd19ff5bcf2b03d67bb01d1ce h: refs/heads/master i: 289611: c61a482621db18deb24cd5c3e1ec1be5531a4c65 v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/core.h | 5 +++++ trunk/drivers/usb/dwc3/gadget.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c3f36235ccf..0ee17fc1125b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 138801aaa566ecb5a5739a85909b9ec7285efd70 +refs/heads/master: 40aa41fba348bc5bd19ff5bcf2b03d67bb01d1ce diff --git a/trunk/drivers/usb/dwc3/core.h b/trunk/drivers/usb/dwc3/core.h index 9e57f8e9bf17..f4878c4dec0f 100644 --- a/trunk/drivers/usb/dwc3/core.h +++ b/trunk/drivers/usb/dwc3/core.h @@ -719,6 +719,11 @@ struct dwc3_event_depevt { u32 endpoint_event:4; u32 reserved11_10:2; u32 status:4; + +/* Within XferNotReady */ +#define DEPEVT_STATUS_TRANSFER_ACTIVE (1 << 3) + +/* Within XferComplete */ #define DEPEVT_STATUS_BUSERR (1 << 0) #define DEPEVT_STATUS_SHORT (1 << 1) #define DEPEVT_STATUS_IOC (1 << 2) diff --git a/trunk/drivers/usb/dwc3/gadget.c b/trunk/drivers/usb/dwc3/gadget.c index e0e2337dad13..4b64dc0bfa27 100644 --- a/trunk/drivers/usb/dwc3/gadget.c +++ b/trunk/drivers/usb/dwc3/gadget.c @@ -1657,7 +1657,8 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc, int ret; dev_vdbg(dwc->dev, "%s: reason %s\n", - dep->name, event->status + dep->name, event->status & + DEPEVT_STATUS_TRANSFER_ACTIVE ? "Transfer Active" : "Transfer Not Active");