summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/media/rc/streamzap.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/media/rc/streamzap.c')
-rw-r--r--kernel/drivers/media/rc/streamzap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/drivers/media/rc/streamzap.c b/kernel/drivers/media/rc/streamzap.c
index bf4a44272..5a17cb88f 100644
--- a/kernel/drivers/media/rc/streamzap.c
+++ b/kernel/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);
}