Merge remote-tracking branch 'regulator/fix/db8500' into tmp

[karo-tx-linux.git] / arch / ia64 / kernel / perfmon.c

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ea39eba61ef5abcdf087b027879196b49d75bb03..433f5e8a2cd147cd7ae696d3e42b0123f6b4f306 100644 (file)
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2221,9 +2221,9 @@ pfm_alloc_file(pfm_context_t *ctx)
        d_add(path.dentry, inode);
 
        file = alloc_file(&path, FMODE_READ, &pfm_file_ops);
-       if (!file) {
+       if (IS_ERR(file)) {
                path_put(&path);
-               return ERR_PTR(-ENFILE);
+               return file;
        }
 
        file->f_flags = O_RDONLY;