]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] s5p-tv: fix wait_event_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 10 Jun 2015 09:02:03 +0000 (06:02 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 11 Aug 2015 09:23:35 +0000 (06:23 -0300)
event API conformance testing with coccinelle spatches are being
used to locate API usage inconsistencies this triggert with:
./drivers/media/platform/s5p-tv/mixer_reg.c:364
        incorrect check for negative return

Return type of wait_event_timeout is signed long not int and the
return type is >=0 always thus the negative check is unnecessary.
An appropriately named variable of type long is inserted and the
call fixed up aswell as the negative return check dropped.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/s5p-tv/mixer_reg.c

index b713403024ef996365bd420d7af9fc7470001d8a..5127acb1e571c5d140a8d63c3de1377cd096246d 100644 (file)
@@ -357,17 +357,15 @@ void mxr_reg_streamoff(struct mxr_device *mdev)
 
 int mxr_reg_wait4vsync(struct mxr_device *mdev)
 {
-       int ret;
+       long time_left;
 
        clear_bit(MXR_EVENT_VSYNC, &mdev->event_flags);
        /* TODO: consider adding interruptible */
-       ret = wait_event_timeout(mdev->event_queue,
-               test_bit(MXR_EVENT_VSYNC, &mdev->event_flags),
-               msecs_to_jiffies(1000));
-       if (ret > 0)
+       time_left = wait_event_timeout(mdev->event_queue,
+                       test_bit(MXR_EVENT_VSYNC, &mdev->event_flags),
+                                msecs_to_jiffies(1000));
+       if (time_left > 0)
                return 0;
-       if (ret < 0)
-               return ret;
        mxr_warn(mdev, "no vsync detected - timeout\n");
        return -ETIME;
 }