diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b07d70c1b..aab7ed1a0e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-28  Pedro Alves  <pedro@codesourcery.com>
+
+	* target.c (memory_xfer_partial): No need to restore shadows if we
+	haven't read anything.
+
 2011-01-28  Pedro Alves  <pedro@codesourcery.com>
 
 	* mips-tdep.c (mips_print_register): Use get_frame_register_value
diff --git a/gdb/target.c b/gdb/target.c
index 710af02c7d..ad695a171b 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1414,7 +1414,7 @@ memory_xfer_partial (struct target_ops *ops, enum target_object object,
     }
   while (ops != NULL);
 
-  if (readbuf && !show_memory_breakpoints)
+  if (res > 0 && readbuf != NULL && !show_memory_breakpoints)
     breakpoint_restore_shadows (readbuf, memaddr, reg_len);
 
   /* Make sure the cache gets updated no matter what - if we are writing