The drm_bridge_funcs.atomic_reset documentation states that the hook
must return either a valid drm_bridge_state object or an ERR_PTR().

The cdns_mhdp_bridge_atomic_reset() callback returns NULL when the
allocation of its state fails, violating this contract.

Return ERR_PTR(-ENOMEM) instead.

Fixes: fb43aa0acdfd ("drm: bridge: Add support for Cadence MHDP8546 DPI/DP 
bridge")
Reviewed-by: Thomas Zimmermann <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>
---
 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index 36c07b71fe04..46779b49545b 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -1925,11 +1925,11 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge)
 {
        struct cdns_mhdp_bridge_state *cdns_mhdp_state;
 
        cdns_mhdp_state = kzalloc_obj(*cdns_mhdp_state);
        if (!cdns_mhdp_state)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        __drm_atomic_helper_bridge_reset(bridge, &cdns_mhdp_state->base);
 
        return &cdns_mhdp_state->base;
 }

-- 
2.54.0

Reply via email to