On Mon, May 07, 2012 at 10:42:15AM +0300, Felipe Balbi wrote:
> Hi Greg,
>
> here are changes for dwc3. Please merge on your usb-next branch.
>
> There will be a conflict with the gadget pull request, because of a
> patch from Ido which removes dep->desc and a patch from Paul which adds
> another dep->desc access. After fixing the conflict (which should be
> very simple) you still need to apply this:
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 1284439..2026dc7 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -1018,7 +1018,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
> int start_trans = 1;
> u8 trans_idx = dep->res_trans_idx;
>
> - if (usb_endpoint_xfer_isoc(dep->desc) &&
> + if (usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
> (dep->flags & DWC3_EP_BUSY)) {
> start_trans = 0;
> WARN_ON_ONCE(!trans_idx);
>
> I'm sorry, but I didn't find a better way to fix it other than merging
> gadget and dwc3 myself :-(
>
> Hope it's not a big problem. I apologize for the extra work.
Not a problem at all, I had to fix up another dep->desc usage in the
file in order to get things to build properly, but it wasn't a big deal.
All pulled and pushed out now, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
