Merge branch 'reiserfs-updates' from Jeff Mahoney

[linux-2.6-omap-h63xx.git] / drivers / media / common / tuners / mxl5005s.c

diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index a8878244bb3c40432fe6b3420e32e338ae32f0ad..0803dab58fff1783d82a4d45ba188e89dac9d698 100644 (file)
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -3598,7 +3598,7 @@ static u16 MXL_GetInitRegister(struct dvb_frontend *fe, u8 *RegNum,
                76, 77, 91, 134, 135, 137, 147,
                156, 166, 167, 168, 25 };
 
-       *count = sizeof(RegAddr) / sizeof(u8);
+       *count = ARRAY_SIZE(RegAddr);
 
        status += MXL_BlockInit(fe);
 
@@ -3630,7 +3630,7 @@ static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum, u8 *RegVal,
        */
 #endif
 
-       *count = sizeof(RegAddr) / sizeof(u8);
+       *count = ARRAY_SIZE(RegAddr);
 
        for (i = 0 ; i < *count; i++) {
                RegNum[i] = RegAddr[i];
@@ -3648,7 +3648,7 @@ static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
 
        u8 RegAddr[] = {43, 136};
 
-       *count = sizeof(RegAddr) / sizeof(u8);
+       *count = ARRAY_SIZE(RegAddr);
 
        for (i = 0; i < *count; i++) {
                RegNum[i] = RegAddr[i];
@@ -4003,12 +4003,11 @@ static int mxl5005s_set_params(struct dvb_frontend *fe,
        /* Change tuner for new modulation type if reqd */
        if (req_mode != state->current_mode) {
                switch (req_mode) {
-               case VSB_8:
-               case QAM_64:
-               case QAM_256:
-               case QAM_AUTO:
+               case MXL_ATSC:
+               case MXL_QAM:
                        req_bw  = MXL5005S_BANDWIDTH_6MHZ;
                        break;
+               case MXL_DVBT:
                default:
                        /* Assume DVB-T */
                        switch (params->u.ofdm.bandwidth) {