2009-11-20 18:21:24

by Roel Kluin

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

The reg_pair2[j].reg was tested twice.

Signed-off-by: Roel Kluin <[email protected]>
---
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;

2009-11-21 01:40:05

by Michael Ira Krufky

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

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 <[email protected]>

Roel Kluin wrote:
> The reg_pair2[j].reg was tested twice.
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html