diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 8c880634af..d2951605da 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-14  Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c (gdb_ust_thread): Don't ignore return value
+	of write.
+
 2011-12-14  Yao Qi  <yao@codesourcery.com>
 
 	* i386-low.c (i386_low_stopped_data_address): Initialize local
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index d50b5f38bd..5f7177f2d0 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -8122,7 +8122,8 @@ gdb_ust_thread (void *arg)
 		strcpy (cmd_buf, "");
 	    }
 
-	  write (fd, buf, 1);
+	  /* Fix compiler's warning: ignoring return value of 'write'.  */
+	  ret = write (fd, buf, 1);
 	  close (fd);
 	}
     }