From 9ff21c833a5424d25a3be56375782e5ae1211217 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 24 Nov 2011 17:28:26 -0800 Subject: [PATCH] --- yaml --- r: 280883 b: refs/heads/master c: 91b158f4d11164bfe5710873c8e162cf8c8d132b h: refs/heads/master i: 280881: 8c9c6a67af1cfcd960d39efa7b59260fecf5d37c 280879: a89ea45240d38628ea5fb2a577ba5f0d5645df77 v: v3 --- [refs] | 2 +- trunk/drivers/usb/renesas_usbhs/mod_gadget.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6eff0217723a..7a75b4fadf3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25fa70795bf11ef6f5b147f0b231a43880ba96ca +refs/heads/master: 91b158f4d11164bfe5710873c8e162cf8c8d132b diff --git a/trunk/drivers/usb/renesas_usbhs/mod_gadget.c b/trunk/drivers/usb/renesas_usbhs/mod_gadget.c index 16484060a24c..dba15e07fbd2 100644 --- a/trunk/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/trunk/drivers/usb/renesas_usbhs/mod_gadget.c @@ -557,14 +557,16 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep) struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep); struct usbhs_pkt *pkt; - usbhs_pipe_disable(pipe); - while (1) { pkt = usbhs_pkt_pop(pipe, NULL); if (!pkt) break; + + usbhsg_queue_pop(uep, usbhsg_pkt_to_ureq(pkt), -ECONNRESET); } + usbhs_pipe_disable(pipe); + return 0; }