From: Olli Salonen Date: Fri, 18 Jul 2014 05:41:12 +0000 (-0300) Subject: [media] si2157: Use name si2157_ops instead of si2157_tuner_ops X-Git-Tag: firefly_0821_release~176^2~2474^2~1194 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6cc8a35dcf6bceb4c6db38ae7862d826b3afb6a2;p=firefly-linux-kernel-4.4.55.git [media] si2157: Use name si2157_ops instead of si2157_tuner_ops The struct prototype is defined at the beginning of the code as "si2157_ops" but the real struct is called "si2157_tuner_ops". This is causing the name to be empty on this info msg: si2157 16-0060: si2157: found a '' in cold state [crope@iki.fi: commit msg from Luis email reply] Signed-off-by: Olli Salonen Cc: Luis Alves Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 329004fbec76..4730f69cac01 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -277,7 +277,7 @@ err: return ret; } -static const struct dvb_tuner_ops si2157_tuner_ops = { +static const struct dvb_tuner_ops si2157_ops = { .info = { .name = "Silicon Labs Si2157/Si2158", .frequency_min = 110000000, @@ -317,7 +317,7 @@ static int si2157_probe(struct i2c_client *client, goto err; fe->tuner_priv = s; - memcpy(&fe->ops.tuner_ops, &si2157_tuner_ops, + memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops)); i2c_set_clientdata(client, s);