[PATCH] V4L/DVB: Fix test in copy_reg_bits()

[PATCH] V4L/DVB: Fix test in copy_reg_bits()

[Roel Kluin]

The reg_pair2[j].reg was tested twice.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
 drivers/media/common/tuners/mxl5007t.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

I think this was intended?

diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index 2d02698..7eb1bf7 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;

Re: [PATCH] V4L/DVB: Fix test in copy_reg_bits()

[Michael Krufky]

Ah!  Nice catch.  Thank you, Roel.  Mauro / Andrew, can one of you 
please merge this?  The driver hasn't changed, so it should go to Linus' 
current tree and also stable, although it isn't crucial.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

Roel Kluin wrote:
> The reg_pair2[j].reg was tested twice.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
>  drivers/media/common/tuners/mxl5007t.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> I think this was intended?
> 
> diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
> index 2d02698..7eb1bf7 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;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html