On Mon, 18 Mar 2013, Greg KH wrote: > On Mon, Mar 18, 2013 at 12:05:54PM -0400, Alan Stern wrote: > > This patch (as1638) makes several changes to the ehci-hcd driver, all > > related to the qh_refresh() function. This function must be called > > whenever an idle QH gets linked back into either the async or the > > periodic schedule. > > > > Change a BUG_ON() in the qh_update routine to a WARN_ON(). > > Since this code runs in atomic context, a BUG_ON() would > > immediately freeze the whole system. > > > > Remove two unneeded calls to qh_refresh(), one when a QH is > > initialized and one when a QH becomes idle. Adjust the > > adjacent comments accordingly. > > > > Move the qh_refresh() and qh_link_periodic() calls for new > > interrupt URBs to after the new TDs have been added. > > > > As a result of the previous two changes, qh_refresh() is never > > called when the qtd_list is empty. The corresponding check in > > qh_refresh() can be removed, along with an indentation level. > > > > These changes should not cause any alteration of behavior. > > > > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > > > > This patch fails to apply to my usb-next branch, after the 4 previous > patches were applied: > > checking file drivers/usb/host/ehci-q.c > Hunk #2 FAILED at 123. > Hunk #3 succeeded at 545 (offset -8 lines). > Hunk #4 succeeded at 557 (offset -8 lines). > Hunk #5 succeeded at 945 (offset -8 lines). > 1 out of 5 hunks FAILED > checking file drivers/usb/host/ehci-sched.c > > Any ideas? I can't apply the rest of them, so can you fix this up and > just resend this, and the remaining patches? I don't know what happened. I haven't synced to your usb-next branch since rc1 was released; maybe that's the problem. I will do so and will resubmit the remaining patches. Alan Stern -- 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
