Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / gpu / host1x / job.c

diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index 18a47f95e90c1dbfd9e937391dc26ebf693e9389..c4e1050f2252679e448e58e1c2b3edffffd08073 100644 (file)
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -466,9 +466,8 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)
                                                         &job->gather_copy,
                                                         GFP_KERNEL);
        if (!job->gather_copy_mapped) {
-               int err = PTR_ERR(job->gather_copy_mapped);
                job->gather_copy_mapped = NULL;
-               return err;
+               return -ENOMEM;
        }
 
        job->gather_copy_size = size;