From be0623e35a755f6eed5e42fb559d773b13913107 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 19 Jul 2010 09:40:43 +0100 Subject: [PATCH] --- yaml --- r: 208052 b: refs/heads/master c: b3864cedfb576e11d2f9274f14a24840d8b569c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b349900564e8..3ecc5984ebad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7a9ff54271bf0ddbf641e5a0bde3ebda35808be +refs/heads/master: b3864cedfb576e11d2f9274f14a24840d8b569c3 diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index 354fd456f8cc..9d32c9ff737d 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -2082,17 +2082,12 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) kill_all_requests(hsotg, &hsotg->eps[0], -ECONNRESET, true); /* it seems after a reset we can end up with a situation - * where the TXFIFO still has data in it... try flushing - * it to remove anything that may still be in it. + * where the TXFIFO still has data in it... the docs + * suggest resetting all the fifos, so use the init_fifo + * code to relayout and flush the fifos. */ - if (1) { - writel(S3C_GRSTCTL_TxFNum(0) | S3C_GRSTCTL_TxFFlsh, - hsotg->regs + S3C_GRSTCTL); - - dev_info(hsotg->dev, "GNPTXSTS=%08x\n", - readl(hsotg->regs + S3C_GNPTXSTS)); - } + s3c_hsotg_init_fifo(hsotg); s3c_hsotg_enqueue_setup(hsotg);