1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index bf4a44272f0e..5a17cb88ff27 100644
--- 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);
 }