Skip to content

Commit ca5e2f4

Browse files
committed
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: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents ebbc04b + 841e512 commit ca5e2f4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

drivers/gpu/drm/bridge/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ config DRM_ITE_IT6505
7878
tristate "ITE IT6505 DisplayPort bridge"
7979
depends on OF
8080
select DRM_KMS_HELPER
81+
select DRM_DP_HELPER
8182
select EXTCON
8283
help
8384
ITE IT6505 DisplayPort bridge chip driver.

drivers/video/fbdev/core/fbmem.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,10 @@ fb_release(struct inode *inode, struct file *file)
14341434
__acquires(&info->lock)
14351435
__releases(&info->lock)
14361436
{
1437-
struct fb_info * const info = file->private_data;
1437+
struct fb_info * const info = file_fb_info(file);
1438+
1439+
if (!info)
1440+
return -ENODEV;
14381441

14391442
lock_fb_info(info);
14401443
if (info->fbops->fb_release)

0 commit comments

Comments
 (0)