diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/media/dvb/bt8xx/dst.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst.c')
-rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index 91353a6faf1d..8b0cde38984d 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c | |||
@@ -1352,8 +1352,7 @@ static int dst_get_tuna(struct dst_state *state) | |||
1352 | return retval; | 1352 | return retval; |
1353 | } | 1353 | } |
1354 | if ((state->type_flags & DST_TYPE_HAS_VLF) && | 1354 | if ((state->type_flags & DST_TYPE_HAS_VLF) && |
1355 | !(state->dst_type == DST_TYPE_IS_CABLE) && | 1355 | !(state->dst_type == DST_TYPE_IS_ATSC)) { |
1356 | !(state->dst_type == DST_TYPE_IS_ATSC)) { | ||
1357 | 1356 | ||
1358 | if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) { | 1357 | if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) { |
1359 | dprintk(verbose, DST_INFO, 1, "checksum failure ? "); | 1358 | dprintk(verbose, DST_INFO, 1, "checksum failure ? "); |
@@ -1820,8 +1819,13 @@ static struct dvb_frontend_ops dst_dvbc_ops = { | |||
1820 | .frequency_max = 858000000, | 1819 | .frequency_max = 858000000, |
1821 | .symbol_rate_min = 1000000, | 1820 | .symbol_rate_min = 1000000, |
1822 | .symbol_rate_max = 45000000, | 1821 | .symbol_rate_max = 45000000, |
1823 | /* . symbol_rate_tolerance = ???,*/ | 1822 | .caps = FE_CAN_FEC_AUTO | |
1824 | .caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | 1823 | FE_CAN_QAM_AUTO | |
1824 | FE_CAN_QAM_16 | | ||
1825 | FE_CAN_QAM_32 | | ||
1826 | FE_CAN_QAM_64 | | ||
1827 | FE_CAN_QAM_128 | | ||
1828 | FE_CAN_QAM_256 | ||
1825 | }, | 1829 | }, |
1826 | 1830 | ||
1827 | .release = dst_release, | 1831 | .release = dst_release, |