diff options
author | Anton Tikhomirov <av.tikhomirov@samsung.com> | 2011-04-21 04:06:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-02 20:00:25 -0400 |
commit | d00f500400a6e309f9bc43d385572f395eba2871 (patch) | |
tree | 735a818e41cf03082e604692175934e68ad007bb | |
parent | 83722bc9430424de1614ff31696f73a40b3d81a9 (diff) |
USB: s3c-hsotg: Fix core reset
This patch fixes code responsible for core reset.
Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com>
Reviewed-by: Kyoungil Kim<ki0351.kim@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 0912679de99a..7cd597ca162f 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
@@ -2491,9 +2491,9 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg) | |||
2491 | timeout = 1000; | 2491 | timeout = 1000; |
2492 | do { | 2492 | do { |
2493 | grstctl = readl(hsotg->regs + S3C_GRSTCTL); | 2493 | grstctl = readl(hsotg->regs + S3C_GRSTCTL); |
2494 | } while (!(grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0); | 2494 | } while ((grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0); |
2495 | 2495 | ||
2496 | if (!(grstctl & S3C_GRSTCTL_CSftRst)) { | 2496 | if (grstctl & S3C_GRSTCTL_CSftRst) { |
2497 | dev_err(hsotg->dev, "Failed to get CSftRst asserted\n"); | 2497 | dev_err(hsotg->dev, "Failed to get CSftRst asserted\n"); |
2498 | return -EINVAL; | 2498 | return -EINVAL; |
2499 | } | 2499 | } |
@@ -2510,9 +2510,6 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg) | |||
2510 | return -ETIMEDOUT; | 2510 | return -ETIMEDOUT; |
2511 | } | 2511 | } |
2512 | 2512 | ||
2513 | if (grstctl & S3C_GRSTCTL_CSftRst) | ||
2514 | continue; | ||
2515 | |||
2516 | if (!(grstctl & S3C_GRSTCTL_AHBIdle)) | 2513 | if (!(grstctl & S3C_GRSTCTL_AHBIdle)) |
2517 | continue; | 2514 | continue; |
2518 | 2515 | ||