drm/dp/mst: Handle errors from drm_atomic_get_private_obj_state() correctly

[linux.git] / drivers / gpu / drm / drm_dp_mst_topology.c

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index bfd237c15e76e8cfe9f3c78ffd555f42390a7d5e..18cecd94acb604027972deb602db5113724bd7a5 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2515,8 +2515,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
        int req_slots;
 
        topology_state = drm_atomic_get_mst_topology_state(state, mgr);
-       if (topology_state == NULL)
-               return -ENOMEM;
+       if (IS_ERR(topology_state))
+               return PTR_ERR(topology_state);
 
        port = drm_dp_get_validated_port_ref(mgr, port);
        if (port == NULL)
@@ -2555,8 +2555,8 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
        struct drm_dp_mst_topology_state *topology_state;
 
        topology_state = drm_atomic_get_mst_topology_state(state, mgr);
-       if (topology_state == NULL)
-               return -ENOMEM;
+       if (IS_ERR(topology_state))
+               return PTR_ERR(topology_state);
 
        /* We cannot rely on port->vcpi.num_slots to update
         * topology_state->avail_slots as the port may not exist if the parent