Hi, On 08/02/2014 10:41 AM, Hans de Goede wrote: > Hi, > > On 08/02/2014 12:58 AM, Greg Kroah-Hartman wrote: >> On Fri, Jul 25, 2014 at 10:01:20PM +0200, Hans de Goede wrote: >>> Lately (with the use of uas / bulk-streams) we have been seeing several >>> cases where this error triggers (which should never happen). >>> >>> Add some extra logging to make debugging these errors easier. >>> >>> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> >>> --- >>> drivers/usb/host/xhci-mem.c | 4 +++- >>> drivers/usb/host/xhci-ring.c | 22 ++++++++++++++++++---- >>> drivers/usb/host/xhci.h | 6 +++--- >>> 3 files changed, 24 insertions(+), 8 deletions(-) >> >> This patch just fails to apply: >> checking file drivers/usb/host/xhci-mem.c >> checking file drivers/usb/host/xhci-ring.c >> Hunk #4 FAILED at 2519. >> 1 out of 4 hunks FAILED >> checking file drivers/usb/host/xhci.h >> Hunk #1 succeeded at 1804 (offset -2 lines). >> >> So while I wanted to apply it, I can't :( > > Oops, I based it on the latest 3.16-rc# at the time of sending, > there probably was something in next already which conflicts. Ok, I've figured out where the conflict came from. I posted another series of 3 patches earlier which already made some logging changes to the same code path, specifically this patch depends on the "xhci: Log ep-index and comp-code on TRB DMA ptr not part of current TD" patch from that series being present. I've squashed the 2 together for the resend I'm about to do. More important that earlier series contained a bug fix, which Matthias said he would pick up, but which does not seem to have made its way into usb-next: http://www.spinics.net/lists/linux-usb/msg110950.html I'll also include that one in the resend. Regards, Hans -- 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
