diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 62c612ca288..914930434c6 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-27  Michael Snyder  <msnyder@vmware.com>
 
+	* server.c (handle_query): Discard unused value.
+
 	* hostio.c (require_data): Free malloc memory before returning
 	error.
 
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index ebfcca4e587..0ddf9de50aa 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1357,7 +1357,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
 
       sprintf (own_buf, "QC");
       own_buf += 2;
-      own_buf = write_ptid (own_buf, gdb_id);
+      write_ptid (own_buf, gdb_id);
       return;
     }