summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-01-15 19:08:30 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-16 15:47:32 +0100
commitd04ca8df70f0e1c3fe6ee2aeb1114b03a3a3de88 (patch)
tree5964d306fc6f3d8cf11963e305f29a49f0186786 /drivers/media
parent[media] anysee: do not attach same frontend twice (diff)
downloadlinux-d04ca8df70f0e1c3fe6ee2aeb1114b03a3a3de88.tar.xz
linux-d04ca8df70f0e1c3fe6ee2aeb1114b03a3a3de88.zip
[media] cxd2820r: do not switch to DVB-T when DVB-C fails
Fix another bug introduced by recent multi-frontend to single-frontend change. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/cxd2820r_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c
index 93e1b12e7907..b789a907c3a2 100644
--- a/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -476,10 +476,10 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
dbg("%s: delsys=%d", __func__, fe->dtv_property_cache.delivery_system);
/* switch between DVB-T and DVB-T2 when tune fails */
- if (priv->last_tune_failed && (priv->delivery_system != SYS_DVBC_ANNEX_A)) {
+ if (priv->last_tune_failed) {
if (priv->delivery_system == SYS_DVBT)
c->delivery_system = SYS_DVBT2;
- else
+ else if (priv->delivery_system == SYS_DVBT2)
c->delivery_system = SYS_DVBT;
}