2012-06-11 Pedro Alves <palves@redhat.com>

	* serial.c (do_serial_close): Remove early return when SCB is
	null.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 61ea7629ee7bced68471dc7048dc69538bc12497..2434e0c184e8239e1473461272e7f43338663dfd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Pedro Alves  <palves@redhat.com>
+
+       * serial.c (do_serial_close): Remove early return when SCB is
+       null.
+
 2012-06-11  Tom Tromey  <tromey@redhat.com>
 
        * dwarf2read.c (dw2_get_file_names_reader): Ignore partial units.

diff --git a/gdb/serial.c b/gdb/serial.c
index 3eed3b9dbcb66faf7ab78e8c9e462dafc42c8a46..9b689ba6e68ea7cc206d0b0e4414a044c409a023 100644 (file)
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -330,12 +330,6 @@ do_serial_close (struct serial *scb, int really_close)
       serial_logfp = NULL;
     }
 
-/* This is bogus.  It's not our fault if you pass us a bad scb...!  Rob, you
-   should fix your code instead.  */
-
-  if (!scb)
-    return;
-
   scb->refcnt--;
   if (scb->refcnt > 0)
     return;