Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[pandora-kernel.git] / drivers / media / dvb / frontends / cx22700.c

diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index fbd838e..0142214 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)
@@ -179,7 +179,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
        cx22700_writereg (state, 0x06, val);
 
        cx22700_writereg (state, 0x08, 0x04 | 0x02);  /* use user tps parameters */
-       cx22700_writereg (state, 0x08, 0x04);         /* restart aquisition */
+       cx22700_writereg (state, 0x08, 0x04);         /* restart acquisition */
 
        return 0;
 }