aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-25 08:36:42 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-06 13:38:42 -0400
commitf68afe5d45198bfe7040cf751033c6208577468c (patch)
tree1abe419bbb9bd26459c12393c80a95d58297f58b /drivers/media/common
parent398b0d1f058636f3950296ca07346577c02b94d6 (diff)
[media] mt20xx.c: fix compiler warnings
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/mt20xx.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/common/tuners/mt20xx.c
index d0e70e10a717..0e74e97e0d1a 100644
--- a/drivers/media/common/tuners/mt20xx.c
+++ b/drivers/media/common/tuners/mt20xx.c
@@ -430,11 +430,10 @@ static void mt2050_set_antenna(struct dvb_frontend *fe, unsigned char antenna)
430{ 430{
431 struct microtune_priv *priv = fe->tuner_priv; 431 struct microtune_priv *priv = fe->tuner_priv;
432 unsigned char buf[2]; 432 unsigned char buf[2];
433 int ret;
434 433
435 buf[0] = 6; 434 buf[0] = 6;
436 buf[1] = antenna ? 0x11 : 0x10; 435 buf[1] = antenna ? 0x11 : 0x10;
437 ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2); 436 tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
438 tuner_dbg("mt2050: enabled antenna connector %d\n", antenna); 437 tuner_dbg("mt2050: enabled antenna connector %d\n", antenna);
439} 438}
440 439
@@ -574,21 +573,20 @@ static int mt2050_init(struct dvb_frontend *fe)
574{ 573{
575 struct microtune_priv *priv = fe->tuner_priv; 574 struct microtune_priv *priv = fe->tuner_priv;
576 unsigned char buf[2]; 575 unsigned char buf[2];
577 int ret;
578 576
579 buf[0]=6; 577 buf[0] = 6;
580 buf[1]=0x10; 578 buf[1] = 0x10;
581 ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2); // power 579 tuner_i2c_xfer_send(&priv->i2c_props, buf, 2); /* power */
582 580
583 buf[0]=0x0f; 581 buf[0] = 0x0f;
584 buf[1]=0x0f; 582 buf[1] = 0x0f;
585 ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2); // m1lo 583 tuner_i2c_xfer_send(&priv->i2c_props, buf, 2); /* m1lo */
586 584
587 buf[0]=0x0d; 585 buf[0] = 0x0d;
588 ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,1); 586 tuner_i2c_xfer_send(&priv->i2c_props, buf, 1);
589 tuner_i2c_xfer_recv(&priv->i2c_props,buf,1); 587 tuner_i2c_xfer_recv(&priv->i2c_props, buf, 1);
590 588
591 tuner_dbg("mt2050: sro is %x\n",buf[0]); 589 tuner_dbg("mt2050: sro is %x\n", buf[0]);
592 590
593 memcpy(&fe->ops.tuner_ops, &mt2050_tuner_ops, sizeof(struct dvb_tuner_ops)); 591 memcpy(&fe->ops.tuner_ops, &mt2050_tuner_ops, sizeof(struct dvb_tuner_ops));
594 592