Commit 3d3921d1 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2023-02-28' of...

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

Short summary of fixes pull:

Fixes uninitialized variables in fbdev error paths and reverts an
SHMEM-helper symbol back to being exported as GPL.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/3Fw1HjgPcplo+j@linux-uq9g
parents a48bba98 047a7545
...@@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem) ...@@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)
return sgt; return sgt;
} }
EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt); EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);
/** /**
* drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from * drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from
......
...@@ -136,7 +136,7 @@ static const struct drm_fb_helper_funcs msm_fb_helper_funcs = { ...@@ -136,7 +136,7 @@ static const struct drm_fb_helper_funcs msm_fb_helper_funcs = {
struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev) struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
{ {
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
struct msm_fbdev *fbdev = NULL; struct msm_fbdev *fbdev;
struct drm_fb_helper *helper; struct drm_fb_helper *helper;
int ret; int ret;
......
...@@ -233,7 +233,7 @@ void omap_fbdev_init(struct drm_device *dev) ...@@ -233,7 +233,7 @@ void omap_fbdev_init(struct drm_device *dev)
fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
if (!fbdev) if (!fbdev)
goto fail; return;
INIT_WORK(&fbdev->work, pan_worker); INIT_WORK(&fbdev->work, pan_worker);
......
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