diff options
author | Antti Palosaari <crope@iki.fi> | 2012-01-20 17:48:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 15:10:52 -0500 |
commit | 72565224609a23a60d10fcdf42f87a2fa8f7b16d (patch) | |
tree | 4e59cfd7e7b0bde3459a99b8d035fec288220b8f /drivers/media/dvb | |
parent | 46de20a78ae4b122b79fc02633e9a6c3d539ecad (diff) |
[media] cxd2820r: sleep on DVB-T/T2 delivery system switch
Fix bug introduced by multi-frontend to single-frontend change.
It is safer to put DVB-T parts sleeping when auto-switching to DVB-T2
and vice versa. That was original behaviour.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/frontends/cxd2820r_core.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c index bdfa207a883e..5c7c2aaf9bf5 100644 --- a/drivers/media/dvb/frontends/cxd2820r_core.c +++ b/drivers/media/dvb/frontends/cxd2820r_core.c | |||
@@ -482,10 +482,19 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe) | |||
482 | 482 | ||
483 | /* switch between DVB-T and DVB-T2 when tune fails */ | 483 | /* switch between DVB-T and DVB-T2 when tune fails */ |
484 | if (priv->last_tune_failed) { | 484 | if (priv->last_tune_failed) { |
485 | if (priv->delivery_system == SYS_DVBT) | 485 | if (priv->delivery_system == SYS_DVBT) { |
486 | ret = cxd2820r_sleep_t(fe); | ||
487 | if (ret) | ||
488 | goto error; | ||
489 | |||
486 | c->delivery_system = SYS_DVBT2; | 490 | c->delivery_system = SYS_DVBT2; |
487 | else if (priv->delivery_system == SYS_DVBT2) | 491 | } else if (priv->delivery_system == SYS_DVBT2) { |
492 | ret = cxd2820r_sleep_t2(fe); | ||
493 | if (ret) | ||
494 | goto error; | ||
495 | |||
488 | c->delivery_system = SYS_DVBT; | 496 | c->delivery_system = SYS_DVBT; |
497 | } | ||
489 | } | 498 | } |
490 | 499 | ||
491 | /* set frontend */ | 500 | /* set frontend */ |