Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2e324d7 authored by Gianluca Gennari's avatar Gianluca Gennari Committed by Mauro Carvalho Chehab
Browse files

[media] r820t: remove redundant initializations in r820t_attach() 



fe->tuner_priv and fe->ops.tuner_ops are initialized twice in r820t_attach().
Remove the redundant initializations and also move fe->ops.tuner_ops
initialization outside of the mutex lock (as in the xc4000 tuner code for example).

Signed-off-by: default avatarGianluca Gennari <gennarone@gmail.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c2efd3e6

drivers/media/tuners/r820t.c

+3 −6
Original line number Diff line number Diff line
@@ -2310,8 +2310,6 @@ struct dvb_frontend *r820t_attach(struct dvb_frontend *fe, 
		break;

	}



	memcpy(&fe->ops.tuner_ops, &r820t_tuner_ops, sizeof(r820t_tuner_ops));



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);
@@ -2326,15 +2324,14 @@ struct dvb_frontend *r820t_attach(struct dvb_frontend *fe, 


	tuner_info("Rafael Micro r820t successfully identified\n");



	fe->tuner_priv = priv;

	memcpy(&fe->ops.tuner_ops, &r820t_tuner_ops,

			sizeof(struct dvb_tuner_ops));



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 0);



	mutex_unlock(&r820t_list_mutex);



	memcpy(&fe->ops.tuner_ops, &r820t_tuner_ops,

			sizeof(struct dvb_tuner_ops));



	return fe;

err:

	if (fe->ops.i2c_gate_ctrl)