Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248864
b: refs/heads/master
c: 66e5c64
h: refs/heads/master
v: v3
  • Loading branch information
Jingoo Han authored and Greg Kroah-Hartman committed May 13, 2011
1 parent 90b3261 commit 9dfae8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6167660b284447c710d9067754c69feab229892
refs/heads/master: 66e5c643488a26d2a6b737bdbd92fc72f13cdeac
7 changes: 3 additions & 4 deletions trunk/drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,11 +616,10 @@ static unsigned get_ep_limit(struct s3c_hsotg_ep *hs_ep)
maxpkt = S3C_DxEPTSIZ_PktCnt_LIMIT + 1;
} else {
maxsize = 64+64;
if (hs_ep->dir_in) {
if (hs_ep->dir_in)
maxpkt = S3C_DIEPTSIZ0_PktCnt_LIMIT + 1;
} else {
else
maxpkt = 2;
}
}

/* we made the constant loading easier above by using +1 */
Expand Down Expand Up @@ -2568,7 +2567,7 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg)
if (!(grstctl & S3C_GRSTCTL_AHBIdle))
continue;

break; /* reset done */
break; /* reset done */
}

dev_dbg(hsotg->dev, "reset successful\n");
Expand Down

0 comments on commit 9dfae8d

Please sign in to comment.