From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 20 Nov 2009 18:34:13 +0000 (-0300)
Subject: V4L/DVB: Fix test in copy_reg_bits()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c95a419a5604ec8a23cd73f61e9bb151e8cbe89b;hp=5375659a3df319700d97d911e44926fb43354839;p=deliverable%2Flinux.git

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>
---

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,
 	i = j = 0;
 
 	while (reg_pair1[i].reg || reg_pair1[i].val) {
-		while (reg_pair2[j].reg || reg_pair2[j].reg) {
+		while (reg_pair2[j].reg || reg_pair2[j].val) {
 			if (reg_pair1[i].reg != reg_pair2[j].reg) {
 				j++;
 				continue;