diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-12-15 13:05:43 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-12-15 13:05:43 +0300 |
| commit | ae75a0431f822273ce5d3a574863c67503db5775 (patch) | |
| tree | 1361bf5e24d1d38f993c08583f42eda4fb28b42e /drivers/gpu/drm/rockchip | |
| parent | 91def3cce986238db7c06af083b8e9e30372a895 (diff) | |
| parent | 5fbd41d3bf123af6a135bdea564087ec0f563eb0 (diff) | |
| download | linux-ae75a0431f822273ce5d3a574863c67503db5775.tar.xz | |
Merge drm/drm-next into drm-misc-next
Required backmerge since we will be based on top of v5.11, and there
has been a request to backmerge already to upstream some features.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c index 8658ef82d937..654bc52d9ff3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -544,7 +544,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, struct device_node *port, *endpoint; int ret = 0, child_count = 0; const char *name; - u32 endpoint_id; + u32 endpoint_id = 0; lvds->drm_dev = drm_dev; port = of_graph_get_port_by_id(dev->of_node, 1); |