diff options
| author |   Dave Airlie <airlied@redhat.com> | 2016-03-17 08:08:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-17 08:08:57 +1000 |
| commit | 0e5dc9a8ee2f10b5d6c793675e9942c526e52411 (patch) | |
| tree | 703d710ab16502c117a15f404a5a1947f2214436 | |
| parent | nouveau: fix nv40_perfctr_next() cleanup regression (diff) | |
| parent | gpu: host1x: Use a signed return type for do_relocs() (diff) | |
| download | linux-dev-0e5dc9a8ee2f10b5d6c793675e9942c526e52411.tar.xz linux-dev-0e5dc9a8ee2f10b5d6c793675e9942c526e52411.zip | |
Merge tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux into drm-next
drm/tegra: Changes for v4.6-rc1
Only two cleanups this time around. One fixes reference counting of
device tree nodes, the other changes the return value of a function
from an unsigned int to an int to reflect that it will return error
codes.
* tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux:
gpu: host1x: Use a signed return type for do_relocs()
gpu: host1x: bus: Add missing of_node_put()
| -rw-r--r-- | drivers/gpu/host1x/bus.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/host1x/job.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index dd2dbb9746ce..c27858ae0552 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -83,8 +83,10 @@ static int host1x_device_parse_dt(struct host1x_device *device, if (of_match_node(driver->subdevs, np) && of_device_is_available(np)) { err = host1x_subdev_add(device, np); - if (err < 0) + if (err < 0) { + of_node_put(np); return err; + } } } diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index 63bd63f3c7df..1919aab88c3f 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -225,7 +225,7 @@ unpin: return 0; } -static unsigned int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf) +static int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf) { int i = 0; u32 last_page = ~0; |