aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/budget-av.c
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@linuxtv.org>2005-09-09 16:02:30 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:38 -0400
commitcfbfce1566f11c0dbad8a16173f0448b0c78cecb (patch)
treecd090616b3a13c130b72238f92390761bda71e39 /drivers/media/dvb/ttpci/budget-av.c
parent4ff4ac1beae58a2fea7ec2ad43d6c3b60d90ec61 (diff)
[PATCH] dvb: frontend: stv0299: pass i2c bus to pll callback
Pass a pointer to the i2c bus to the pll callbacks (stv0299 only). It was not possible to tell which i2c bus should be used if an adapter has multiple frontends on multiple i2c buses. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-av.c')
-rw-r--r--drivers/media/dvb/ttpci/budget-av.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 9746d2bb916f..311be50b2fce 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -453,9 +453,9 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra
453} 453}
454 454
455static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe, 455static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,
456 struct i2c_adapter *i2c,
456 struct dvb_frontend_parameters *params) 457 struct dvb_frontend_parameters *params)
457{ 458{
458 struct budget_av *budget_av = (struct budget_av *) fe->dvb->priv;
459 u32 div; 459 u32 div;
460 u8 buf[4]; 460 u8 buf[4];
461 struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) }; 461 struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
@@ -481,7 +481,7 @@ static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,
481 else if (params->frequency < 2150000) 481 else if (params->frequency < 2150000)
482 buf[3] |= 0xC0; 482 buf[3] |= 0xC0;
483 483
484 if (i2c_transfer(&budget_av->budget.i2c_adap, &msg, 1) != 1) 484 if (i2c_transfer(i2c, &msg, 1) != 1)
485 return -EIO; 485 return -EIO;
486 return 0; 486 return 0;
487} 487}