2 files changed, 3 insertions, 6 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 8e19acbf2886..18a3ea1aac51 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -165,14 +165,11 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent,
         buf.error = 0;
 
         error = vfs_readdir(file, osf_filldir, &buf);
-        if (error < 0)
-                goto out_putf;
-
-        error = buf.error;
+        if (error >= 0)
+                error = buf.error;
         if (count != buf.count)
                 error = count - buf.count;
 
- out_putf:
         fput(file);
  out:
         return error;
diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index 7c3d5ec6ec67..bd8ac533a504 100644
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -106,7 +106,7 @@ op_axp_stop(void)
 }
 
 static int
-op_axp_create_files(struct super_block * sb, struct dentry * root)
+op_axp_create_files(struct super_block *sb, struct dentry *root)
 {
         int i;