Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / drivers / media / dvb / frontends / cx22700.c

diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index fbd838eca268765e79268a3165f3fb34f9908a8d..5fbc0fc37ecd4785c41547216e9722ae8e69c5ab 100644 (file)
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -155,7 +155,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
            p->hierarchy_information > HIERARCHY_4)
                return -EINVAL;
 
-       if (p->bandwidth < BANDWIDTH_8_MHZ && p->bandwidth > BANDWIDTH_6_MHZ)
+       if (p->bandwidth < BANDWIDTH_8_MHZ || p->bandwidth > BANDWIDTH_6_MHZ)
                return -EINVAL;
 
        if (p->bandwidth == BANDWIDTH_7_MHZ)