]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/bridge/panel: Fix runtime warning on panel bridge release
authorAdam Miotk <adam.miotk@arm.com>
Mon, 10 Jun 2024 10:27:39 +0000 (11:27 +0100)
committerMaxime Ripard <mripard@kernel.org>
Mon, 10 Jun 2024 11:22:05 +0000 (13:22 +0200)
Device managed panel bridge wrappers are created by calling to
drm_panel_bridge_add_typed() and registering a release handler for
clean-up when the device gets unbound.

Since the memory for this bridge is also managed and linked to the panel
device, the release function should not try to free that memory.
Moreover, the call to devm_kfree() inside drm_panel_bridge_remove() will
fail in this case and emit a warning because the panel bridge resource
is no longer on the device resources list (it has been removed from
there before the call to release handlers).

Fixes: 67022227ffb1 ("drm/bridge: Add a devm_ allocator for panel bridge.")
Signed-off-by: Adam Miotk <adam.miotk@arm.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240610102739.139852-1-adam.miotk@arm.com
drivers/gpu/drm/bridge/panel.c

index 32506524d9a2d185a078620cad3e28183da068c2..fe5fb08c9fc42b3f2306094aa287842afbd61e49 100644 (file)
@@ -360,9 +360,12 @@ EXPORT_SYMBOL(drm_panel_bridge_set_orientation);
 
 static void devm_drm_panel_bridge_release(struct device *dev, void *res)
 {
-       struct drm_bridge **bridge = res;
+       struct drm_bridge *bridge = *(struct drm_bridge **)res;
 
-       drm_panel_bridge_remove(*bridge);
+       if (!bridge)
+               return;
+
+       drm_bridge_remove(bridge);
 }
 
 /**