diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:29 -0400 |
| commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
| tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /drivers/usb/musb/musb_host.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/musb/musb_host.c')
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index dec896e888db..877d20b1dff9 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
| @@ -2042,6 +2042,7 @@ static int musb_urb_enqueue( | |||
| 2042 | * odd, rare, error prone, but legal. | 2042 | * odd, rare, error prone, but legal. |
| 2043 | */ | 2043 | */ |
| 2044 | kfree(qh); | 2044 | kfree(qh); |
| 2045 | qh = NULL; | ||
| 2045 | ret = 0; | 2046 | ret = 0; |
| 2046 | } else | 2047 | } else |
| 2047 | ret = musb_schedule(musb, qh, | 2048 | ret = musb_schedule(musb, qh, |