diff --git a/gas/ChangeLog b/gas/ChangeLog
index 59e755e389..f92c3d6759 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* input-file.c (input_file_open): Rearrange to avoid warning.
+
 2005-02-19  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/tc-hppa.h (TC_EQUAL_IN_INSN): Delete.
@@ -205,8 +209,7 @@
 
 2005-02-11  H.J. Lu  <hongjiu.lu@intel.com>
 
-	(dot_xdata): Undo the last change. Section name is used by
-	set_section.
+	* config/tc-ia64.c (dot_xdata): Undo the last change.
 	(dot_float_cons): Likewise.
 	(dot_xstringer): Likewise.
 	(dot_xdata_ua): Likewise.
diff --git a/gas/input-file.c b/gas/input-file.c
index 01cc669fef..8fb04f7bc9 100644
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,5 +1,6 @@
 /* input_file.c - Deal with Input Files -
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2003
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
+   2003, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -146,21 +147,26 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
       file_name = _("{standard input}");
     }
 
-  if (f_in)
-    c = getc (f_in);
+  if (f_in == NULL)
+    {
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
+      as_perror (_("Can't open %s for reading"), file_name);
+      return;
+    }
 
-  if (f_in == NULL || ferror (f_in))
+  c = getc (f_in);
+
+  if (ferror (f_in))
     {
 #ifdef BFD_ASSEMBLER
       bfd_set_error (bfd_error_system_call);
 #endif
       as_perror (_("Can't open %s for reading"), file_name);
 
-      if (f_in)
-	{
-	  fclose (f_in);
-	  f_in = NULL;
-	}
+      fclose (f_in);
+      f_in = NULL;
       return;
     }