Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...

[karo-tx-linux.git] / arch / mips / kernel / branch.c

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index c2e0f45ddf6cf48d05f7b97b5a095de0a04fca19..c0c5e5972256e95273d7e34a0b4c3c4132232cd0 100644 (file)
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -36,8 +36,10 @@ int __isa_exception_epc(struct pt_regs *regs)
                return epc;
        }
        if (cpu_has_mips16) {
-               if (((union mips16e_instruction)inst).ri.opcode
-                               == MIPS16e_jal_op)
+               union mips16e_instruction inst_mips16e;
+
+               inst_mips16e.full = inst;
+               if (inst_mips16e.ri.opcode == MIPS16e_jal_op)
                        epc += 4;
                else
                        epc += 2;