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

airlied · airlied · commit 0e5dc9a8ee2f · 2016-03-17T08:08:57.000+10:00
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()
diff --git 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
@@ -225,7 +225,7 @@ static unsigned int pin_job(struct host1x_job *job)
 	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;

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,10 @@ static int host1x_device_parse_dt(struct host1x_device *device,`
`83`	`83`	`if (of_match_node(driver->subdevs, np) &&`
`84`	`84`	`of_device_is_available(np)) {`
`85`	`85`	`err = host1x_subdev_add(device, np);`
`86`		`- if (err < 0)`
	`86`	`+ if (err < 0) {`
	`87`	`+ of_node_put(np);`
`87`	`88`	`return err;`
	`89`	`+ }`
`88`	`90`	`}`
`89`	`91`	`}`
`90`	`92`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ static unsigned int pin_job(struct host1x_job *job)`
`225`	`225`	`return 0;`
`226`	`226`	`}`
`227`	`227`
`228`		`-static unsigned int do_relocs(struct host1x_job job, struct host1x_bo cmdbuf)`
	`228`	`+static int do_relocs(struct host1x_job job, struct host1x_bo cmdbuf)`
`229`	`229`	`{`
`230`	`230`	`int i = 0;`
`231`	`231`	`u32 last_page = ~0;`