diff options
author | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
---|---|---|
committer | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/arm/hdlcd_drv.c | |
parent | drm/i915: Correct pipe fault reporting string (diff) | |
parent | Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff) | |
download | kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.xz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/arm/hdlcd_drv.c')
-rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index fb6a418ce6be..6477d1a65266 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -453,7 +453,8 @@ static int hdlcd_probe(struct platform_device *pdev) return -EAGAIN; } - component_match_add(&pdev->dev, &match, compare_dev, port); + drm_of_component_match_add(&pdev->dev, &match, compare_dev, port); + of_node_put(port); return component_master_add_with_match(&pdev->dev, &hdlcd_master_ops, match); |