diff options
author | Dave Airlie <airlied@redhat.com> | 2020-08-11 03:58:31 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-08-11 03:58:31 +0200 |
commit | c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5 (patch) | |
tree | ad77b18ffeafb50b3eb9ba6472670dc1d96f5558 /drivers/gpu/drm/drm_of.c | |
parent | Merge tag 'drm-misc-next-fixes-2020-08-05' of git://anongit.freedesktop.org/d... (diff) | |
parent | Linux 5.8 (diff) | |
download | linux-c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5.tar.xz linux-c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5.zip |
Merge tag 'v5.8' into drm-next
I need to backmerge 5.8 as I've got a bunch of fixes sitting
on an rc7 base that I want to land.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_of.c')
-rw-r--r-- | drivers/gpu/drm/drm_of.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index fdb05fbf72a0..ca04c34e8251 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -331,10 +331,8 @@ static int drm_of_lvds_get_remote_pixels_type( * configurations by passing the endpoints explicitly to * drm_of_lvds_get_dual_link_pixel_order(). */ - if (!current_pt || pixels_type != current_pt) { - of_node_put(remote_port); + if (!current_pt || pixels_type != current_pt) return -EINVAL; - } } return pixels_type; |