summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_ioctl32.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-02-02 10:03:18 +1100
committerDave Chinner <david@fromorbit.com>2015-02-02 10:03:18 +1100
commit3fd1b0d158b6b98d9561e2f7f9c6970d95cf71d6 (patch)
tree3a32490a8db83ca2ed6da6701af20e3cd6adff2c /fs/xfs/xfs_ioctl32.c
parent438c3c8d2bb910966db6fc4140e62d67b3c5f2a8 (diff)
parent2ba66237029d1ad6c1a5e2241b0ffbbfff55f750 (diff)
Merge branch 'xfs-misc-fixes-for-3.20-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl32.c')
-rw-r--r--fs/xfs/xfs_ioctl32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index ec6772866f3d..bfc7c7c8a0c8 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -423,7 +423,7 @@ xfs_compat_attrmulti_by_handle(
ops = memdup_user(compat_ptr(am_hreq.ops), size);
if (IS_ERR(ops)) {
- error = -PTR_ERR(ops);
+ error = PTR_ERR(ops);
goto out_dput;
}