media: pvrusb2: fix the retry logic
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 26 Jun 2017 12:33:56 +0000 (08:33 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 20 Jul 2017 20:25:41 +0000 (16:25 -0400)
As reported by this warning:
drivers/media/usb/pvrusb2/pvrusb2-encoder.c:263 pvr2_encoder_cmd() warn: continue to end of do { ... } while(0); loop

There's an issue at the retry logic there: the current logic is:

do {
if (need_to_retry)
continue;

some_code();
} while (0);

Well, that won't work, as continue will make it test for zero, and
abort the loop. So, change the loop to:

while (1) {
if (need_to_retry)
continue;

some_code();
break;
};

With seems to be what's actually expected there.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/usb/pvrusb2/pvrusb2-encoder.c

index ca637074fa1ff3e74e7491373998a4b679a5ce8a..43e43404095f4ce3a7a3b8e509d95f4fcd3e29b4 100644 (file)
@@ -198,7 +198,7 @@ static int pvr2_encoder_cmd(void *ctxt,
        }
 
 
-       LOCK_TAKE(hdw->ctl_lock); do {
+       LOCK_TAKE(hdw->ctl_lock); while (1) {
 
                if (!hdw->state_encoder_ok) {
                        ret = -EIO;
@@ -293,9 +293,9 @@ rdData[0]);
 
                wrData[0] = 0x0;
                ret = pvr2_encoder_write_words(hdw,MBOX_BASE,wrData,1);
-               if (ret) break;
+               break;
 
-       } while(0); LOCK_GIVE(hdw->ctl_lock);
+       }; LOCK_GIVE(hdw->ctl_lock);
 
        return ret;
 }