Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[cascardo/linux.git] / drivers / media / i2c / ov2659.c

diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 6edffc7..49109f4 100644 (file)
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -909,7 +909,6 @@ static void ov2659_pll_calc_params(struct ov2659 *ov2659)
        u8 ctrl1_reg = 0, ctrl2_reg = 0, ctrl3_reg = 0;
        struct i2c_client *client = ov2659->client;
        unsigned int desired = pdata->link_frequency;
-       u32 s_prediv = 1, s_postdiv = 1, s_mult = 1;
        u32 prediv, postdiv, mult;
        u32 bestdelta = -1;
        u32 delta, actual;
@@ -929,9 +928,6 @@ static void ov2659_pll_calc_params(struct ov2659 *ov2659)
 
                                if ((delta < bestdelta) || (bestdelta == -1)) {
                                        bestdelta = delta;
-                                       s_mult    = mult;
-                                       s_prediv  = prediv;
-                                       s_postdiv = postdiv;
                                        ctrl1_reg = ctrl1[i].reg;
                                        ctrl2_reg = mult;
                                        ctrl3_reg = ctrl3[j].reg;