diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
| commit | 5145edef1efa16e6947c27c7487fac545e8b5939 (patch) | |
| tree | 835d67bb642027c7abaa62246b450993d250a52f /arch/mips/kernel/vpe.c | |
| parent | 451bdbef06b85c4e82538debfd7b295fa08fe501 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'arch/mips/kernel/vpe.c')
| -rw-r--r-- | arch/mips/kernel/vpe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 2cd50ad0d5c..3efcb065f78 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -192,7 +192,7 @@ static struct tc *get_tc(int index) } spin_unlock(&vpecontrol.tc_list_lock); - return NULL; + return res; } /* allocate a vpe and associate it with this minor (or index) */ |