Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / media / common / tuners / tda9887.c

diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index ff1788cc5d48ef6068a9759dd61061388e299445..a71c100c95df674c60ff3033624f675f420f14c9 100644 (file)
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -180,11 +180,10 @@ static struct tvnorm tvnorms[] = {
        },{
                .std   = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H,
                .name  = "SECAM-BGH",
-               .b     = ( cPositiveAmTV  |
+               .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cTopDefault),
-               .e     = ( cGating_36     |
-                          cAudioIF_5_5   |
+               .e     = ( cAudioIF_5_5   |
                           cVideoIF_38_90 ),
        },{
                .std   = V4L2_STD_SECAM_L,
@@ -464,7 +463,7 @@ static int tda9887_set_insmod(struct dvb_frontend *fe)
                        buf[1] &= ~cQSS;
        }
 
-       if (adjust >= 0x00 && adjust < 0x20) {
+       if (adjust < 0x20) {
                buf[2] &= ~cTopMask;
                buf[2] |= adjust;
        }