On Fri, Nov 09, 2012 at 11:30:36PM +0200, Felipe Balbi wrote: > Hi Greg, > > Here are gadget patches for v3.8, and it also conflicts with your > usb-next branch. Below you can find my resolution (suggested > by Kuninori): > > diff --cc drivers/usb/renesas_usbhs/fifo.c > index c021b20,72ad375..9538f0f > --- a/drivers/usb/renesas_usbhs/fifo.c > +++ b/drivers/usb/renesas_usbhs/fifo.c > @@@ -795,7 -798,7 +798,8 @@@ static void xfer_work(struct work_struc > dev_dbg(dev, " %s %d (%d/ %d)\n", > fifo->name, usbhs_pipe_number(pipe), pkt->length, pkt->zero); > > + usbhs_pipe_set_trans_count_if_bulk(pipe, pkt->trans); > + usbhs_pipe_enable(pipe); > usbhsf_dma_start(pipe, fifo); > dma_async_issue_pending(chan); > } > > The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37: > > Linux 3.7-rc1 (2012-10-14 14:41:04 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.8 Thanks for the resolution, I would have done it backwards :) Now pulled and pushed out. 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
