diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-04-26 05:25:37 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-04-26 05:49:52 +0300 |
| commit | 86ab9985214d9918113d6387bd0640e6166e68d1 (patch) | |
| tree | 712e7583605af3840bb9d4a82562fabc0f214c3b /drivers/video/fbdev/core/fb_defio.c | |
| parent | 26da9bfdb8c6d9a64534cbcce9ffabad3bac5eb0 (diff) | |
| parent | 78d9161d2bcd442d93d917339297ffa057dbee8c (diff) | |
| download | linux-86ab9985214d9918113d6387bd0640e6166e68d1.tar.xz | |
Merge tag 'drm-misc-fixes-2024-04-25' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull:
atomic-helpers:
- Fix memory leak in drm_format_conv_state_copy()
fbdev:
- fbdefio: Fix address calculation
gma500:
- Fix crash during boot
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425102413.GA6301@localhost.localdomain
Diffstat (limited to 'drivers/video/fbdev/core/fb_defio.c')
| -rw-r--r-- | drivers/video/fbdev/core/fb_defio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index dae96c9f61cf..806ecd32219b 100644 --- a/drivers/video/fbdev/core/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c @@ -196,7 +196,7 @@ err_mutex_unlock: */ static vm_fault_t fb_deferred_io_page_mkwrite(struct fb_info *info, struct vm_fault *vmf) { - unsigned long offset = vmf->address - vmf->vma->vm_start; + unsigned long offset = vmf->pgoff << PAGE_SHIFT; struct page *page = vmf->page; file_update_time(vmf->vma->vm_file); |