diff options
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110.c')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index e4c6e87f6c5d..c91cf8958b38 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -1668,9 +1668,8 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra | |||
1668 | return 0; | 1668 | return 0; |
1669 | } | 1669 | } |
1670 | 1670 | ||
1671 | static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 1671 | static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params) |
1672 | { | 1672 | { |
1673 | struct av7110* av7110 = (struct av7110*) fe->dvb->priv; | ||
1674 | int ret; | 1673 | int ret; |
1675 | u8 data[4]; | 1674 | u8 data[4]; |
1676 | u32 div; | 1675 | u32 div; |
@@ -1687,7 +1686,7 @@ static int alps_bsru6_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param | |||
1687 | 1686 | ||
1688 | if (params->frequency > 1530000) data[3] = 0xc0; | 1687 | if (params->frequency > 1530000) data[3] = 0xc0; |
1689 | 1688 | ||
1690 | ret = i2c_transfer(&av7110->i2c_adap, &msg, 1); | 1689 | ret = i2c_transfer(i2c, &msg, 1); |
1691 | if (ret != 1) | 1690 | if (ret != 1) |
1692 | return -EIO; | 1691 | return -EIO; |
1693 | return 0; | 1692 | return 0; |
@@ -1751,9 +1750,8 @@ static u8 alps_bsbe1_inittab[] = { | |||
1751 | 0xff, 0xff | 1750 | 0xff, 0xff |
1752 | }; | 1751 | }; |
1753 | 1752 | ||
1754 | static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 1753 | static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params) |
1755 | { | 1754 | { |
1756 | struct av7110* av7110 = (struct av7110*) fe->dvb->priv; | ||
1757 | int ret; | 1755 | int ret; |
1758 | u8 data[4]; | 1756 | u8 data[4]; |
1759 | u32 div; | 1757 | u32 div; |
@@ -1768,7 +1766,7 @@ static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param | |||
1768 | data[2] = 0x80 | ((div & 0x18000) >> 10) | 4; | 1766 | data[2] = 0x80 | ((div & 0x18000) >> 10) | 4; |
1769 | data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4; | 1767 | data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4; |
1770 | 1768 | ||
1771 | ret = i2c_transfer(&av7110->i2c_adap, &msg, 1); | 1769 | ret = i2c_transfer(i2c, &msg, 1); |
1772 | return (ret != 1) ? -EIO : 0; | 1770 | return (ret != 1) ? -EIO : 0; |
1773 | } | 1771 | } |
1774 | 1772 | ||