Commit ca5e2f4d authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-fixes-2022-05-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

drm-misc-fixes for v5.18-rc6:
- Small fix for hot-unplugging fb devices.
- Kconfig fix for it6505.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/69e51773-8c6f-4ff7-9a06-5c2922a43999@linux.intel.com
parents ebbc04bd 841e512f
...@@ -78,6 +78,7 @@ config DRM_ITE_IT6505 ...@@ -78,6 +78,7 @@ config DRM_ITE_IT6505
tristate "ITE IT6505 DisplayPort bridge" tristate "ITE IT6505 DisplayPort bridge"
depends on OF depends on OF
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_DP_HELPER
select EXTCON select EXTCON
help help
ITE IT6505 DisplayPort bridge chip driver. ITE IT6505 DisplayPort bridge chip driver.
......
...@@ -1434,7 +1434,10 @@ fb_release(struct inode *inode, struct file *file) ...@@ -1434,7 +1434,10 @@ fb_release(struct inode *inode, struct file *file)
__acquires(&info->lock) __acquires(&info->lock)
__releases(&info->lock) __releases(&info->lock)
{ {
struct fb_info * const info = file->private_data; struct fb_info * const info = file_fb_info(file);
if (!info)
return -ENODEV;
lock_fb_info(info); lock_fb_info(info);
if (info->fbops->fb_release) if (info->fbops->fb_release)
......
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