diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 61ea7629ee7..2434e0c184e 100644
--- 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 3eed3b9dbcb..9b689ba6e68 100644
--- 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;