Unverified Commit 6ce08a32 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4928 drm/bridge: sii902x: Fix probing race issue 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WOFZWIXJMMALUENIM5ZENWYPKWWXTQSY/ 
 
https://gitee.com/src-openeuler/kernel/issues/I94UOT 
 
Link:https://gitee.com/openeuler/kernel/pulls/4928

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents be9de0f7 a5410895

drivers/gpu/drm/bridge/sii902x.c

+11 −7
Original line number Diff line number Diff line
@@ -998,11 +998,6 @@ static int sii902x_init(struct sii902x *sii902x) 
			return ret;

	}



	sii902x->bridge.funcs = &sii902x_bridge_funcs;

	sii902x->bridge.of_node = dev->of_node;

	sii902x->bridge.timings = &default_sii902x_timings;

	drm_bridge_add(&sii902x->bridge);



	sii902x_audio_codec_init(sii902x, dev);



	i2c_set_clientdata(sii902x->i2c, sii902x);
@@ -1015,7 +1010,16 @@ static int sii902x_init(struct sii902x *sii902x) 
		return -ENOMEM;



	sii902x->i2cmux->priv = sii902x;

	return i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);

	ret = i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);

	if (ret)

		return ret;



	sii902x->bridge.funcs = &sii902x_bridge_funcs;

	sii902x->bridge.of_node = dev->of_node;

	sii902x->bridge.timings = &default_sii902x_timings;

	drm_bridge_add(&sii902x->bridge);



	return 0;

}



static int sii902x_probe(struct i2c_client *client,
@@ -1079,8 +1083,8 @@ static int sii902x_remove(struct i2c_client *client) 
{

	struct sii902x *sii902x = i2c_get_clientdata(client);



	i2c_mux_del_adapters(sii902x->i2cmux);

	drm_bridge_remove(&sii902x->bridge);

	i2c_mux_del_adapters(sii902x->i2cmux);

	regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies),

			       sii902x->supplies);