From: Greg Kroah-Hartman Date: Mon, 12 Nov 2012 01:31:53 +0000 (-0800) Subject: Merge tag 'gadget-for-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... X-Git-Tag: upstream/snapshot3+hdmi~6133^2~59 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fd94beecaff19b346efbf6b77288ab4b0b42dbd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'gadget-for-v3.8' of git://git./linux/kernel/git/balbi/usb into usb-next USB gadget patches from Felipe: "usb: gadget: patches for v3.8 renesas_usbhs implements ->pullup() method, switches over to devm_request_irq(), adds support for DMA Engine and got a few miscelaneous cleanups. The NCM gadget got an endianness fix and the Ethernet gadget a frame size fix. We're finally removing the g_file_storage gadget and sticking to g_mass_storage and the new tcm_usb_gadget gadgets since that was a huge duplicaton of effort anyway. While removing g_file_storage, we also had to fix a bunch of defconfigs which were still pointing to the old gadget. There's a big series getting us closer to being able to introduce our configfs interface. The series converts functions into loadable modules which will, eventually, be registered to the configfs interface. Other than that there's the usual typo fixes and miscelaneous cleanups all over the place." --- 7fd94beecaff19b346efbf6b77288ab4b0b42dbd 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); }