From 797121d1b70c9b683ec286c0013c44fbde6cd181 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Sun, 15 Jan 2012 15:08:30 -0300 Subject: [PATCH] --- yaml --- r: 286413 b: refs/heads/master c: d04ca8df70f0e1c3fe6ee2aeb1114b03a3a3de88 h: refs/heads/master i: 286411: d2bb670b81011c23b3c01583c77ff7bb64ccebf5 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/cxd2820r_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ccb5ef572ac7..3935dee49c6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faf27976a745ac126943a500c48b30c0dd1082d3 +refs/heads/master: d04ca8df70f0e1c3fe6ee2aeb1114b03a3a3de88 diff --git a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c b/trunk/drivers/media/dvb/frontends/cxd2820r_core.c index 93e1b12e7907..b789a907c3a2 100644 --- a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c +++ b/trunk/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; }