diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7bfe2725d8..3ba989a482 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-19  Hui Zhu  <teawater@gmail.com>
+
+	* tracepoint.c (tfile_trace_find): Return directly when num is -1.
+
 2011-05-19  Hui Zhu  <teawater@gmail.com>
 
 	* xcoffread.c (read_xcoff_symtab): Initialize fcn_aux_saved.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index ab390152e8..4dae2516ef 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3815,6 +3815,12 @@ tfile_trace_find (enum trace_find_type type, int num,
      first.  */
   if (type != tfind_number)
     set_tfile_traceframe ();
+  else if (num == -1)
+    {
+      if (tpp)
+        *tpp = -1;
+      return -1;
+    }
 
   lseek (trace_fd, trace_frames_offset, SEEK_SET);
   offset = trace_frames_offset;