Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (9040): TTUSB-DEC DVB-S: claim to have lock

As reported by BOUWSMA Barry the readout of the signal status doesn't work
on dec3000-s models. Since we don't know how to do it better, revert back
to the old behaviour and always report a signal lock.

Reported by Barry Bouwsma

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Peter Beutner and committed by
Mauro Carvalho Chehab
4d2858c6 bdc203e1

+13 -3
+13 -3
drivers/media/dvb/ttusb-dec/ttusbdecfe.c
··· 38 38 }; 39 39 40 40 41 - static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status) 41 + static int ttusbdecfe_dvbs_read_status(struct dvb_frontend *fe, 42 + fe_status_t *status) 43 + { 44 + *status = FE_HAS_SIGNAL | FE_HAS_VITERBI | 45 + FE_HAS_SYNC | FE_HAS_CARRIER | FE_HAS_LOCK; 46 + return 0; 47 + } 48 + 49 + 50 + static int ttusbdecfe_dvbt_read_status(struct dvb_frontend *fe, 51 + fe_status_t *status) 42 52 { 43 53 struct ttusbdecfe_state* state = fe->demodulator_priv; 44 54 u8 b[] = { 0x00, 0x00, 0x00, 0x00, ··· 261 251 262 252 .get_tune_settings = ttusbdecfe_dvbt_get_tune_settings, 263 253 264 - .read_status = ttusbdecfe_read_status, 254 + .read_status = ttusbdecfe_dvbt_read_status, 265 255 }; 266 256 267 257 static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = { ··· 283 273 284 274 .set_frontend = ttusbdecfe_dvbs_set_frontend, 285 275 286 - .read_status = ttusbdecfe_read_status, 276 + .read_status = ttusbdecfe_dvbs_read_status, 287 277 288 278 .diseqc_send_master_cmd = ttusbdecfe_dvbs_diseqc_send_master_cmd, 289 279 .set_voltage = ttusbdecfe_dvbs_set_voltage,