Commit 8dd931f4 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2018-08-02' of...

Merge tag 'drm-misc-next-fixes-2018-08-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Fixes an oops on the DP CEC code and a memory leak on the vkms driver.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Gustavo Padovan <gustavo@padovan.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180802111728.GA27945@juma
parents 940fbcb7 2ead1be5
...@@ -157,7 +157,7 @@ static void drm_dp_cec_adap_status(struct cec_adapter *adap, ...@@ -157,7 +157,7 @@ static void drm_dp_cec_adap_status(struct cec_adapter *adap,
if (drm_dp_read_desc(aux, &desc, true)) if (drm_dp_read_desc(aux, &desc, true))
return; return;
seq_printf(file, "OUI: %*pdH\n", seq_printf(file, "OUI: %*phD\n",
(int)sizeof(id->oui), id->oui); (int)sizeof(id->oui), id->oui);
seq_printf(file, "ID: %*pE\n", seq_printf(file, "ID: %*pE\n",
(int)strnlen(id->device_id, sizeof(id->device_id)), (int)strnlen(id->device_id, sizeof(id->device_id)),
......
...@@ -44,6 +44,7 @@ static void vkms_release(struct drm_device *dev) ...@@ -44,6 +44,7 @@ static void vkms_release(struct drm_device *dev)
struct vkms_device *vkms = container_of(dev, struct vkms_device, drm); struct vkms_device *vkms = container_of(dev, struct vkms_device, drm);
platform_device_unregister(vkms->platform); platform_device_unregister(vkms->platform);
drm_atomic_helper_shutdown(&vkms->drm);
drm_mode_config_cleanup(&vkms->drm); drm_mode_config_cleanup(&vkms->drm);
drm_dev_fini(&vkms->drm); drm_dev_fini(&vkms->drm);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment