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

!9568 media: mxl111sf: change mutex_init() location 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RDMHSTTC4EU6ZXPEXLCIRHDVXJRWAQPG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SIB 
 
Link:https://gitee.com/openeuler/kernel/pulls/9568

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents ffc8fa93 cabe56fe

drivers/media/usb/dvb-usb-v2/mxl111sf.c

+14 −2
Original line number Diff line number Diff line
@@ -932,8 +932,6 @@ static int mxl111sf_init(struct dvb_usb_device *d) 
		  .len = sizeof(eeprom), .buf = eeprom },

	};



	mutex_init(&state->msg_lock);



	ret = get_chip_info(state);

	if (mxl_fail(ret))

		pr_err("failed to get chip info during probe");
@@ -1075,6 +1073,14 @@ static int mxl111sf_get_stream_config_dvbt(struct dvb_frontend *fe, 
	return 0;

}



static int mxl111sf_probe(struct dvb_usb_device *dev)

{

	struct mxl111sf_state *state = d_to_priv(dev);



	mutex_init(&state->msg_lock);

	return 0;

}



static struct dvb_usb_device_properties mxl111sf_props_dvbt = {

	.driver_name = KBUILD_MODNAME,

	.owner = THIS_MODULE,
@@ -1084,6 +1090,7 @@ static struct dvb_usb_device_properties mxl111sf_props_dvbt = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_dvbt,

	.tuner_attach      = mxl111sf_attach_tuner,
@@ -1125,6 +1132,7 @@ static struct dvb_usb_device_properties mxl111sf_props_atsc = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_atsc,

	.tuner_attach      = mxl111sf_attach_tuner,
@@ -1166,6 +1174,7 @@ static struct dvb_usb_device_properties mxl111sf_props_mh = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_mh,

	.tuner_attach      = mxl111sf_attach_tuner,
@@ -1234,6 +1243,7 @@ static struct dvb_usb_device_properties mxl111sf_props_atsc_mh = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_atsc_mh,

	.tuner_attach      = mxl111sf_attach_tuner,
@@ -1312,6 +1322,7 @@ static struct dvb_usb_device_properties mxl111sf_props_mercury = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_mercury,

	.tuner_attach      = mxl111sf_attach_tuner,
@@ -1382,6 +1393,7 @@ static struct dvb_usb_device_properties mxl111sf_props_mercury_mh = { 
	.generic_bulk_ctrl_endpoint = 0x02,

	.generic_bulk_ctrl_endpoint_response = 0x81,



	.probe             = mxl111sf_probe,

	.i2c_algo          = &mxl111sf_i2c_algo,

	.frontend_attach   = mxl111sf_frontend_attach_mercury_mh,

	.tuner_attach      = mxl111sf_attach_tuner,