Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk...

[karo-tx-linux.git] / drivers / media / tuners / qt1010.c

diff --git a/drivers/media/tuners/qt1010.c b/drivers/media/tuners/qt1010.c
index bc419f8a967152d02caf0bc11cb9491753b649a4..ae8cbece6d2bcbea783b2722ba1d2b5a805ebeec 100644 (file)
--- a/drivers/media/tuners/qt1010.c
+++ b/drivers/media/tuners/qt1010.c
@@ -294,7 +294,7 @@ static int qt1010_init(struct dvb_frontend *fe)
        int err = 0;
        u8 i, tmpval, *valptr = NULL;
 
-       qt1010_i2c_oper_t i2c_data[] = {
+       static const qt1010_i2c_oper_t i2c_data[] = {
                { QT1010_WR, 0x01, 0x80 },
                { QT1010_WR, 0x0d, 0x84 },
                { QT1010_WR, 0x0e, 0xb7 },
@@ -354,13 +354,17 @@ static int qt1010_init(struct dvb_frontend *fe)
                                valptr = &priv->reg1f_init_val;
                        else
                                valptr = &tmpval;
+
+                       BUG_ON(i >= ARRAY_SIZE(i2c_data) - 1);
+
                        err = qt1010_init_meas1(priv, i2c_data[i+1].reg,
                                                i2c_data[i].reg,
                                                i2c_data[i].val, valptr);
                        i++;
                        break;
                }
-               if (err) return err;
+               if (err)
+                       return err;
        }
 
        for (i = 0x31; i < 0x3a; i++) /* 0x31 - 0x39 */