summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/bridge/waveshare-dsi.c4
-rw-r--r--drivers/gpu/drm/tiny/Kconfig2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/bridge/waveshare-dsi.c b/drivers/gpu/drm/bridge/waveshare-dsi.c
index 01c70e7d3d3b..43f4e7412d72 100644
--- a/drivers/gpu/drm/bridge/waveshare-dsi.c
+++ b/drivers/gpu/drm/bridge/waveshare-dsi.c
@@ -147,8 +147,8 @@ static int ws_bridge_probe(struct i2c_client *i2c)
int ret;
ws = devm_drm_bridge_alloc(dev, struct ws_bridge, bridge, &ws_bridge_bridge_funcs);
- if (!ws)
- return -ENOMEM;
+ if (IS_ERR(ws))
+ return PTR_ERR(ws);
ws->dev = dev;
diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index 94a5bf61a115..7d9e85e932d7 100644
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -86,7 +86,7 @@ config DRM_PIXPAPER
tristate "DRM support for PIXPAPER display panels"
depends on DRM && SPI
select DRM_CLIENT_SELECTION
- select DRM_GEM_DMA_HELPER
+ select DRM_GEM_SHMEM_HELPER
select DRM_KMS_HELPER
help
DRM driver for the Mayqueen Pixpaper e-ink display panel.