Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 7e55457a491f..1f998bfde165 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -201,12 +201,8 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                                 ret = -EIO;
                                 goto out_tsk;
                         }
-                        if (child->thread.dsp.used_dsp) {
-                                dspreg_t *dregs = __get_dsp_regs(child);
-                                tmp = (unsigned long) (dregs[addr - DSP_BASE]);
-                        } else {
-                                tmp = -1;       /* DSP registers yet used  */
-                        }
+                        dspreg_t *dregs = __get_dsp_regs(child);
+                        tmp = (unsigned long) (dregs[addr - DSP_BASE]);
                         break;
                 case DSP_CONTROL:
                         if (!cpu_has_dsp) {