aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-03-20 09:37:38 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-02 21:24:00 -0400
commit67e6590aa9384f87492e20f78a5943718baa695b (patch)
tree21b81a5937d8819aa93f5357a50a90d607fb34b2
parent0fd68f2f7aee2343f2396188362ba41447d8004f (diff)
[media] m88ts2022: Nested loops shouldn't use the same index variable
There are a pair of nested loops inside m88ts2022_cmd() that use the same index variable, but for different things. Split the variable. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/tuners/m88ts2022.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/tuners/m88ts2022.c b/drivers/media/tuners/m88ts2022.c
index 066e5431da93..cdf9fe5376c6 100644
--- a/drivers/media/tuners/m88ts2022.c
+++ b/drivers/media/tuners/m88ts2022.c
@@ -21,7 +21,7 @@
21static int m88ts2022_cmd(struct m88ts2022_dev *dev, int op, int sleep, u8 reg, 21static int m88ts2022_cmd(struct m88ts2022_dev *dev, int op, int sleep, u8 reg,
22 u8 mask, u8 val, u8 *reg_val) 22 u8 mask, u8 val, u8 *reg_val)
23{ 23{
24 int ret, i; 24 int ret, i, j;
25 unsigned int utmp; 25 unsigned int utmp;
26 struct m88ts2022_reg_val reg_vals[] = { 26 struct m88ts2022_reg_val reg_vals[] = {
27 {0x51, 0x1f - op}, 27 {0x51, 0x1f - op},
@@ -35,9 +35,9 @@ static int m88ts2022_cmd(struct m88ts2022_dev *dev, int op, int sleep, u8 reg,
35 "i=%d op=%02x reg=%02x mask=%02x val=%02x\n", 35 "i=%d op=%02x reg=%02x mask=%02x val=%02x\n",
36 i, op, reg, mask, val); 36 i, op, reg, mask, val);
37 37
38 for (i = 0; i < ARRAY_SIZE(reg_vals); i++) { 38 for (j = 0; j < ARRAY_SIZE(reg_vals); j++) {
39 ret = regmap_write(dev->regmap, reg_vals[i].reg, 39 ret = regmap_write(dev->regmap, reg_vals[j].reg,
40 reg_vals[i].val); 40 reg_vals[j].val);
41 if (ret) 41 if (ret)
42 goto err; 42 goto err;
43 } 43 }