Commit bc77bde2 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Robert Foss

drm/bridge: sii902x: Fix audio codec unregistration

The driver never unregisters the audio codec platform device, which can
lead to a crash on module reloading, nor does it handle the return value
from sii902x_audio_codec_init().
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Fixes: ff578163 ("drm/bridge: sii902x: Implement HDMI audio support")
Cc: Jyri Sarha <jsarha@ti.com>
Reviewed-by: default avatarAradhya Bhatia <a-bhatia1@ti.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRobert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240103-si902x-fixes-v1-2-b9fd3e448411@ideasonboard.com
parent dffdfb8f
...@@ -1080,7 +1080,9 @@ static int sii902x_init(struct sii902x *sii902x) ...@@ -1080,7 +1080,9 @@ static int sii902x_init(struct sii902x *sii902x)
return ret; return ret;
} }
sii902x_audio_codec_init(sii902x, dev); ret = sii902x_audio_codec_init(sii902x, dev);
if (ret)
return ret;
i2c_set_clientdata(sii902x->i2c, sii902x); i2c_set_clientdata(sii902x->i2c, sii902x);
...@@ -1088,13 +1090,15 @@ static int sii902x_init(struct sii902x *sii902x) ...@@ -1088,13 +1090,15 @@ static int sii902x_init(struct sii902x *sii902x)
1, 0, I2C_MUX_GATE, 1, 0, I2C_MUX_GATE,
sii902x_i2c_bypass_select, sii902x_i2c_bypass_select,
sii902x_i2c_bypass_deselect); sii902x_i2c_bypass_deselect);
if (!sii902x->i2cmux) if (!sii902x->i2cmux) {
return -ENOMEM; ret = -ENOMEM;
goto err_unreg_audio;
}
sii902x->i2cmux->priv = sii902x; sii902x->i2cmux->priv = sii902x;
ret = i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0); ret = i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);
if (ret) if (ret)
return ret; goto err_unreg_audio;
sii902x->bridge.funcs = &sii902x_bridge_funcs; sii902x->bridge.funcs = &sii902x_bridge_funcs;
sii902x->bridge.of_node = dev->of_node; sii902x->bridge.of_node = dev->of_node;
...@@ -1107,6 +1111,12 @@ static int sii902x_init(struct sii902x *sii902x) ...@@ -1107,6 +1111,12 @@ static int sii902x_init(struct sii902x *sii902x)
drm_bridge_add(&sii902x->bridge); drm_bridge_add(&sii902x->bridge);
return 0; return 0;
err_unreg_audio:
if (!PTR_ERR_OR_ZERO(sii902x->audio.pdev))
platform_device_unregister(sii902x->audio.pdev);
return ret;
} }
static int sii902x_probe(struct i2c_client *client) static int sii902x_probe(struct i2c_client *client)
...@@ -1179,6 +1189,9 @@ static void sii902x_remove(struct i2c_client *client) ...@@ -1179,6 +1189,9 @@ static void sii902x_remove(struct i2c_client *client)
drm_bridge_remove(&sii902x->bridge); drm_bridge_remove(&sii902x->bridge);
i2c_mux_del_adapters(sii902x->i2cmux); i2c_mux_del_adapters(sii902x->i2cmux);
if (!PTR_ERR_OR_ZERO(sii902x->audio.pdev))
platform_device_unregister(sii902x->audio.pdev);
} }
static const struct of_device_id sii902x_dt_ids[] = { static const struct of_device_id sii902x_dt_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment