From cba6795b3066fd7e12b3cfdd646175768d3056a3 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 4 May 2012 14:17:06 +0200 Subject: [PATCH] --- yaml --- r: 303822 b: refs/heads/master c: b3546c97c7bb89294fc3da2718b3fabe7ee4c579 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index dde007bf6e29..a92265a757f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 308d734e9ed86b6713da46b4b9ce9ff017e75c63 +refs/heads/master: b3546c97c7bb89294fc3da2718b3fabe7ee4c579 diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index 8d8652876c67..d0e4fb3bc465 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -2211,12 +2211,11 @@ static void s3c_hsotg_core_init(struct s3c_hsotg *hsotg) /* Clear any pending interrupts */ writel(0xffffffff, hsotg->regs + S3C_GINTSTS); - writel(S3C_GINTSTS_DisconnInt | S3C_GINTSTS_SessReqInt | + writel(S3C_GINTSTS_ErlySusp | S3C_GINTSTS_SessReqInt | S3C_GINTSTS_GOUTNakEff | S3C_GINTSTS_GINNakEff | S3C_GINTSTS_ConIDStsChng | S3C_GINTSTS_USBRst | S3C_GINTSTS_EnumDone | S3C_GINTSTS_OTGInt | - S3C_GINTSTS_USBSusp | S3C_GINTSTS_WkUpInt | - S3C_GINTSTS_ErlySusp, + S3C_GINTSTS_USBSusp | S3C_GINTSTS_WkUpInt, hsotg->regs + S3C_GINTMSK); if (using_dma(hsotg)) @@ -2339,13 +2338,6 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) writel(otgint, hsotg->regs + S3C_GOTGINT); } - if (gintsts & S3C_GINTSTS_DisconnInt) { - dev_dbg(hsotg->dev, "%s: DisconnInt\n", __func__); - writel(S3C_GINTSTS_DisconnInt, hsotg->regs + S3C_GINTSTS); - - s3c_hsotg_disconnect_irq(hsotg); - } - if (gintsts & S3C_GINTSTS_SessReqInt) { dev_dbg(hsotg->dev, "%s: SessReqInt\n", __func__); writel(S3C_GINTSTS_SessReqInt, hsotg->regs + S3C_GINTSTS);