Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / media / rc / streamzap.c

diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index bf4a44272f0e3e00a01c0bc3fb44720e1732ec27..5a17cb88ff27e45e12482b50170fc15e7f386fa9 100644 (file)
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -152,7 +152,8 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
                                sz->signal_last.tv_usec);
                        rawir.duration -= sz->sum;
                        rawir.duration = US_TO_NS(rawir.duration);
-                       rawir.duration &= IR_MAX_DURATION;
+                       rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
+                                        IR_MAX_DURATION : rawir.duration;
                }
                sz_push(sz, rawir);
 
@@ -165,7 +166,8 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
        rawir.duration += SZ_RESOLUTION / 2;
        sz->sum += rawir.duration;
        rawir.duration = US_TO_NS(rawir.duration);
-       rawir.duration &= IR_MAX_DURATION;
+       rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
+                        IR_MAX_DURATION : rawir.duration;
        sz_push(sz, rawir);
 }