Skip to content

Commit 3d3921d

Browse files
committed
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: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/Y/3Fw1HjgPcplo+j@linux-uq9g
2 parents a48bba9 + 047a754 commit 3d3921d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

drivers/gpu/drm/drm_gem_shmem_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem)
744744

745745
return sgt;
746746
}
747-
EXPORT_SYMBOL(drm_gem_shmem_get_pages_sgt);
747+
EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt);
748748

749749
/**
750750
* drm_gem_shmem_prime_import_sg_table - Produce a shmem GEM object from

drivers/gpu/drm/msm/msm_fbdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static const struct drm_fb_helper_funcs msm_fb_helper_funcs = {
136136
struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
137137
{
138138
struct msm_drm_private *priv = dev->dev_private;
139-
struct msm_fbdev *fbdev = NULL;
139+
struct msm_fbdev *fbdev;
140140
struct drm_fb_helper *helper;
141141
int ret;
142142

drivers/gpu/drm/omapdrm/omap_fbdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ void omap_fbdev_init(struct drm_device *dev)
233233

234234
fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
235235
if (!fbdev)
236-
goto fail;
236+
return;
237237

238238
INIT_WORK(&fbdev->work, pan_worker);
239239

0 commit comments

Comments
 (0)