diff options
author | Dave Chinner <david@fromorbit.com> | 2015-02-02 10:03:18 +1100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-02-02 10:03:18 +1100 |
commit | 3fd1b0d158b6b98d9561e2f7f9c6970d95cf71d6 (patch) | |
tree | 3a32490a8db83ca2ed6da6701af20e3cd6adff2c /fs/xfs/xfs_ioctl32.c | |
parent | 438c3c8d2bb910966db6fc4140e62d67b3c5f2a8 (diff) | |
parent | 2ba66237029d1ad6c1a5e2241b0ffbbfff55f750 (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.c | 2 |
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; } |