diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:22:57 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:31:41 +0000 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /drivers/gpu/host1x/job.c | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
| download | lwn-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.gz lwn-4fd69331ad227a4d8de26592d017b73e00caca9f.zip | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'drivers/gpu/host1x/job.c')
| -rw-r--r-- | drivers/gpu/host1x/job.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index 1146e3bba6e1..112f27e51bc7 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -538,7 +538,7 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev) g->base = job->gather_addr_phys[i]; - for (j = 0; j < job->num_gathers; j++) + for (j = i + 1; j < job->num_gathers; j++) if (job->gathers[j].bo == g->bo) job->gathers[j].handled = true; |