diff options
-rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 50c71aae2cc2..4b5dbd0127f5 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
@@ -2392,7 +2392,7 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg) | |||
2392 | grstctl = readl(hsotg->regs + S3C_GRSTCTL); | 2392 | grstctl = readl(hsotg->regs + S3C_GRSTCTL); |
2393 | } while (!(grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0); | 2393 | } while (!(grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0); |
2394 | 2394 | ||
2395 | if (!grstctl & S3C_GRSTCTL_CSftRst) { | 2395 | if (!(grstctl & S3C_GRSTCTL_CSftRst)) { |
2396 | dev_err(hsotg->dev, "Failed to get CSftRst asserted\n"); | 2396 | dev_err(hsotg->dev, "Failed to get CSftRst asserted\n"); |
2397 | return -EINVAL; | 2397 | return -EINVAL; |
2398 | } | 2398 | } |
@@ -2514,8 +2514,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
2514 | * DMA mode we may need this. */ | 2514 | * DMA mode we may need this. */ |
2515 | writel(S3C_DOEPMSK_SetupMsk | S3C_DOEPMSK_AHBErrMsk | | 2515 | writel(S3C_DOEPMSK_SetupMsk | S3C_DOEPMSK_AHBErrMsk | |
2516 | S3C_DOEPMSK_EPDisbldMsk | | 2516 | S3C_DOEPMSK_EPDisbldMsk | |
2517 | using_dma(hsotg) ? (S3C_DIEPMSK_XferComplMsk | | 2517 | (using_dma(hsotg) ? (S3C_DIEPMSK_XferComplMsk | |
2518 | S3C_DIEPMSK_TimeOUTMsk) : 0, | 2518 | S3C_DIEPMSK_TimeOUTMsk) : 0), |
2519 | hsotg->regs + S3C_DOEPMSK); | 2519 | hsotg->regs + S3C_DOEPMSK); |
2520 | 2520 | ||
2521 | writel(0, hsotg->regs + S3C_DAINTMSK); | 2521 | writel(0, hsotg->regs + S3C_DAINTMSK); |