drm/bridge: lt8912b: do not return negative values from .get_modes()
authorJani Nikula <jani.nikula@intel.com>
Fri, 8 Mar 2024 16:03:42 +0000 (18:03 +0200)
committerJani Nikula <jani.nikula@intel.com>
Wed, 13 Mar 2024 08:44:14 +0000 (10:44 +0200)
The .get_modes() hooks aren't supposed to return negative error
codes. Return 0 for no modes, whatever the reason.

Cc: Adrien Grassein <adrien.grassein@gmail.com>
Cc: stable@vger.kernel.org
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/dcdddcbcb64b6f6cdc55022ee50c10dee8ddbc3d.1709913674.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/bridge/lontium-lt8912b.c

index e7c4bef74aa46a37d0e1b4e87a78eee6f1c94b42..4b2ae27f0a57f2461a04f293a540c130a0fd17ee 100644 (file)
@@ -441,23 +441,21 @@ lt8912_connector_mode_valid(struct drm_connector *connector,
 static int lt8912_connector_get_modes(struct drm_connector *connector)
 {
        const struct drm_edid *drm_edid;
-       int ret = -1;
-       int num = 0;
        struct lt8912 *lt = connector_to_lt8912(connector);
        u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+       int ret, num;
 
        drm_edid = drm_bridge_edid_read(lt->hdmi_port, connector);
        drm_edid_connector_update(connector, drm_edid);
-       if (drm_edid) {
-               num = drm_edid_connector_add_modes(connector);
-       } else {
-               return ret;
-       }
+       if (!drm_edid)
+               return 0;
+
+       num = drm_edid_connector_add_modes(connector);
 
        ret = drm_display_info_set_bus_formats(&connector->display_info,
                                               &bus_format, 1);
-       if (ret)
-               num = ret;
+       if (ret < 0)
+               num = 0;
 
        drm_edid_free(drm_edid);
        return num;