Skip to content

Commit a2caae5

Browse files
committed
Merge tag 'drm-misc-next-fixes-2025-09-25' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Short summary of fixes pull: bridge: - waveshare-dsi: Fix error handling in probe function pixpaper: - select GEM SHMEM helpers Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
2 parents 342f141 + 0c4932f commit a2caae5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/gpu/drm/bridge/waveshare-dsi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ static int ws_bridge_probe(struct i2c_client *i2c)
147147
int ret;
148148

149149
ws = devm_drm_bridge_alloc(dev, struct ws_bridge, bridge, &ws_bridge_bridge_funcs);
150-
if (!ws)
151-
return -ENOMEM;
150+
if (IS_ERR(ws))
151+
return PTR_ERR(ws);
152152

153153
ws->dev = dev;
154154

drivers/gpu/drm/tiny/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ config DRM_PIXPAPER
8686
tristate "DRM support for PIXPAPER display panels"
8787
depends on DRM && SPI
8888
select DRM_CLIENT_SELECTION
89-
select DRM_GEM_DMA_HELPER
89+
select DRM_GEM_SHMEM_HELPER
9090
select DRM_KMS_HELPER
9191
help
9292
DRM driver for the Mayqueen Pixpaper e-ink display panel.

0 commit comments

Comments
 (0)