Unverified Commit 941882a0 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Robert Foss
Browse files

drm/bridge: lt8912b: Fix bridge_detach



The driver calls lt8912_bridge_detach() from its lt8912_remove()
function. As the DRM core detaches bridges automatically, this leads to
calling lt8912_bridge_detach() twice. The code probably has tried to
manage the double-call with the 'is_attached' variable, but the driver
never sets the variable to false, so its of no help.

Fix the issue by dropping the call to lt8912_bridge_detach() from
lt8912_remove(), as the DRM core will handle the detach call for us,
and also drop the useless is_attached field.

Fixes: 30e2ae94 ("drm/bridge: Introduce LT8912B DSI to HDMI bridge")
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarRobert Foss <rfoss@kernel.org>
Signed-off-by: default avatarRobert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230804-lt8912b-v1-1-c542692c6a2f@ideasonboard.com
parent d0375f68
Loading
Loading
Loading
Loading
+5 −11
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ struct lt8912 {

	u8 data_lanes;
	bool is_power_on;
	bool is_attached;
};

static int lt8912_write_init_config(struct lt8912 *lt)
@@ -575,8 +574,6 @@ static int lt8912_bridge_attach(struct drm_bridge *bridge,
	if (ret)
		goto error;

	lt->is_attached = true;

	return 0;

error:
@@ -588,7 +585,6 @@ static void lt8912_bridge_detach(struct drm_bridge *bridge)
{
	struct lt8912 *lt = bridge_to_lt8912(bridge);

	if (lt->is_attached) {
	lt8912_hard_power_off(lt);

	if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD)
@@ -597,7 +593,6 @@ static void lt8912_bridge_detach(struct drm_bridge *bridge)
	drm_connector_unregister(&lt->connector);
	drm_connector_cleanup(&lt->connector);
}
}

static enum drm_connector_status
lt8912_bridge_detect(struct drm_bridge *bridge)
@@ -750,7 +745,6 @@ static void lt8912_remove(struct i2c_client *client)
{
	struct lt8912 *lt = i2c_get_clientdata(client);

	lt8912_bridge_detach(&lt->bridge);
	drm_bridge_remove(&lt->bridge);
	lt8912_free_i2c(lt);
	lt8912_put_dt(lt);