On Wed, 18 Apr 2012, Greg KH wrote: > On Tue, Apr 17, 2012 at 03:25:14PM -0400, Alan Stern wrote: > > The ehci-hcd driver is a little haphazard about keeping track of the > > state of the USBCMD register. The ehci->command field is supposed to > > hold the register's value (apart from a few special bits) at all > > times, but it isn't maintained properly. > > > > This patch (as1543) cleans up the situation. It keeps ehci->command > > up-to-date, and uses that value rather than reading the register from > > the hardware whenever possible. > > > > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > > This patch doesn't apply to my usb-next branch: > patching file drivers/usb/host/ehci-dbg.c > Hunk #1 succeeded at 1025 (offset -7 lines). > patching file drivers/usb/host/ehci-hcd.c > Hunk #2 FAILED at 352. > Hunk #3 succeeded at 366 (offset -2 lines). > 1 out of 3 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-hcd.c.rej > patching file drivers/usb/host/ehci-hub.c > Hunk #1 succeeded at 238 (offset 5 lines). > Hunk #2 succeeded at 378 (offset 5 lines). > patching file drivers/usb/host/ehci-q.c > patching file drivers/usb/host/ehci-sched.c > > Can you refresh it so I can apply it? I have no idea what went wrong. The original patch email does look suspicious -- it says 6 files were changed but lists only 5 files, and the number of changed lines for ehci-hcd.c is listed as 18 when in fact there are only 16 lines changed. I just refreshed my copy of your usb-next branch -- the top commit is now the one where you merged in 3.4-rc4 (09091a4d5f2dd378dcf71de50b48cdacc58a8ac0) -- and the old patch still applies perfectly well. I'll send it again (in a separate email) just in case. 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
