diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e11ea1a6b5..73ba8cd3aa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-07  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* mips-tdep.c (mips_breakpoint_from_pc): Rename local `status'
+	to `err' in the little-endian leg.
+
 2016-01-06  Yao Qi  <yao.qi@linaro.org>
 
 	* arch/arm-get-next-pcs.c (arm_get_next_pcs): Move it to some
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c8e12e8827..ca17864f68 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -7170,12 +7170,13 @@ mips_breakpoint_from_pc (struct gdbarch *gdbarch,
 	  static gdb_byte micromips16_little_breakpoint[] = { 0x85, 0x46 };
 	  static gdb_byte micromips32_little_breakpoint[] = { 0x5, 0, 0x7, 0 };
 	  ULONGEST insn;
-	  int status;
+	  int err;
 	  int size;
 
-	  insn = mips_fetch_instruction (gdbarch, ISA_MICROMIPS, pc, &status);
-	  size = status ? 2
-			: mips_insn_size (ISA_MICROMIPS, insn) == 2 ? 2 : 4;
+	  insn = mips_fetch_instruction (gdbarch, ISA_MICROMIPS, pc, &err);
+	  size = (err != 0
+		  ? 2 : (mips_insn_size (ISA_MICROMIPS, insn) == 2
+			 ? 2 : 4));
 	  *pcptr = unmake_compact_addr (pc);
 	  *lenptr = size;
 	  return (size == 2) ? micromips16_little_breakpoint