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

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 --combined drivers/gpu/host1x/bus.c
index dd2dbb9,c2e7fba..c27858a
--- 1/drivers/gpu/host1x/bus.c
--- 2/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@@ -18,7 -18,6 +18,7 @@@
  #include <linux/host1x.h>
  #include <linux/of.h>
  #include <linux/slab.h>
 +#include <linux/of_device.h>
  
  #include "bus.h"
  #include "dev.h"
@@@ -83,8 -82,10 +83,10 @@@ static int host1x_device_parse_dt(struc
                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;
+                       }
                }
        }
  
@@@ -395,7 -396,6 +397,7 @@@ static int host1x_device_add(struct hos
        device->dev.coherent_dma_mask = host1x->dev->coherent_dma_mask;
        device->dev.dma_mask = &device->dev.coherent_dma_mask;
        dev_set_name(&device->dev, "%s", driver->driver.name);
 +      of_dma_configure(&device->dev, host1x->dev->of_node);
        device->dev.release = host1x_device_release;
        device->dev.bus = &host1x_bus_type;
        device->dev.parent = host1x->dev;