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/gpu/drm/gma500/psb_device.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/gpu/drm/gma500/psb_device.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_device.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c index dcfcd7b89d4a..6dece8f0e380 100644 --- a/drivers/gpu/drm/gma500/psb_device.c +++ b/drivers/gpu/drm/gma500/psb_device.c @@ -73,8 +73,7 @@ static int psb_backlight_setup(struct drm_device *dev) } psb_intel_lvds_set_brightness(dev, PSB_MAX_BRIGHTNESS); - /* This must occur after the backlight is properly initialised */ - psb_lid_timer_init(dev_priv); + return 0; } @@ -259,8 +258,6 @@ static int psb_chip_setup(struct drm_device *dev) static void psb_chip_teardown(struct drm_device *dev) { - struct drm_psb_private *dev_priv = to_drm_psb_private(dev); - psb_lid_timer_takedown(dev_priv); gma_intel_teardown_gmbus(dev); } |