diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:27:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:27:23 -0500 |
| commit | b00560f2d4de69bb12f66f9605985b516df98d77 (patch) | |
| tree | 0c92fc994125dc3ddb635842715be29d8b16808b /drivers/usb/gadget/r8a66597-udc.c | |
| parent | bf1af3a809506645b9130755b713b008da14737f (diff) | |
| parent | 4fe757dd48a9e95e1a071291f15dda5421dacb66 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we need to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/gadget/r8a66597-udc.c')
| -rw-r--r-- | drivers/usb/gadget/r8a66597-udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index 20d43da319ae..015118535f77 100644 --- a/drivers/usb/gadget/r8a66597-udc.c +++ b/drivers/usb/gadget/r8a66597-udc.c | |||
| @@ -258,7 +258,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597, | |||
| 258 | break; | 258 | break; |
| 259 | case R8A66597_BULK: | 259 | case R8A66597_BULK: |
| 260 | /* isochronous pipes may be used as bulk pipes */ | 260 | /* isochronous pipes may be used as bulk pipes */ |
| 261 | if (info->pipe > R8A66597_BASE_PIPENUM_BULK) | 261 | if (info->pipe >= R8A66597_BASE_PIPENUM_BULK) |
| 262 | bufnum = info->pipe - R8A66597_BASE_PIPENUM_BULK; | 262 | bufnum = info->pipe - R8A66597_BASE_PIPENUM_BULK; |
| 263 | else | 263 | else |
| 264 | bufnum = info->pipe - R8A66597_BASE_PIPENUM_ISOC; | 264 | bufnum = info->pipe - R8A66597_BASE_PIPENUM_ISOC; |