aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-11-20 13:34:13 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:45 -0500
commitc95a419a5604ec8a23cd73f61e9bb151e8cbe89b (patch)
tree1acbac86a206c4ed86b37e392da671b970893721 /drivers/media/common
parent5375659a3df319700d97d911e44926fb43354839 (diff)
V4L/DVB: Fix test in copy_reg_bits()
The reg_pair2[j].reg was tested twice. Cc: <stable@kernel.org> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/mxl5007t.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index 2d02698d4f4f..7eb1bf75cd07 100644
--- a/drivers/media/common/tuners/mxl5007t.c
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -196,7 +196,7 @@ static void copy_reg_bits(struct reg_pair_t *reg_pair1,
196 i = j = 0; 196 i = j = 0;
197 197
198 while (reg_pair1[i].reg || reg_pair1[i].val) { 198 while (reg_pair1[i].reg || reg_pair1[i].val) {
199 while (reg_pair2[j].reg || reg_pair2[j].reg) { 199 while (reg_pair2[j].reg || reg_pair2[j].val) {
200 if (reg_pair1[i].reg != reg_pair2[j].reg) { 200 if (reg_pair1[i].reg != reg_pair2[j].reg) {
201 j++; 201 j++;
202 continue; 202 continue;