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

!6664 drm/bridge: adv7511: fix crash on irq during probe 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Wenhui <zhaowenhui8@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XJFCD5IK4KHTOQS26IC7EZGOWYRVAHAV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HKEE 
 
Link:https://gitee.com/openeuler/kernel/pulls/6664

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents b7d2d35f ee155b83

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+12 −11
Original line number Diff line number Diff line
@@ -1194,17 +1194,6 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 


	INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work);



	if (i2c->irq) {

		init_waitqueue_head(&adv7511->wq);



		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,

						adv7511_irq_handler,

						IRQF_ONESHOT, dev_name(dev),

						adv7511);

		if (ret)

			goto err_unregister_cec;

	}



	adv7511_power_off(adv7511);



	i2c_set_clientdata(i2c, adv7511);
@@ -1222,6 +1211,18 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 
	drm_bridge_add(&adv7511->bridge);



	adv7511_audio_init(dev, adv7511);



	if (i2c->irq) {

		init_waitqueue_head(&adv7511->wq);



		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,

						adv7511_irq_handler,

						IRQF_ONESHOT, dev_name(dev),

						adv7511);

		if (ret)

			goto err_unregister_cec;

	}



	return 0;



err_unregister_cec: