apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux into drm-next

Browse Source 
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()
This commit is contained in:
Dave Airlie
2016-03-17 08:08:57 +10:00
parent 86d65b7e7a 341917fe2b
commit 0e5dc9a8ee
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/host1x/bus.c
+3 -1
View File
@@ -83,8 +83,10 @@ static int host1x_device_parse_dt(struct host1x_device *device,
if (of_match_node(driver->subdevs, np) && if (of_match_node(driver->subdevs, np) &&
of_device_is_available(np)) { of_device_is_available(np)) {
err = host1x_subdev_add(device, np); err = host1x_subdev_add(device, np);
if (err < 0) if (err < 0) {
of_node_put(np);
return err; return err;
}
} }
} }
drivers/gpu/host1x/job.c
+1 -1
View File
@@ -225,7 +225,7 @@ unpin:
return 0; 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; int i = 0;
u32 last_page = ~0; u32 last_page = ~0;