From 06dee2fee2ce6eb88fbf798b0d263aca0491ac68 Mon Sep 17 00:00:00 2001 From: Sean Young Date: Thu, 19 Jan 2017 19:44:00 -0200 Subject: [PATCH] UPSTREAM: [media] lirc: LIRC_GET_MIN_TIMEOUT should be in range LIRC_SET_REC_TIMEOUT can fail if the value returned by LIRC_GET_MIN_TIMEOUT is set due to rounding errors. Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab (cherry picked from commit f348b4d323a67a5639ccbd3de5add5383573e4a5) Signed-off-by: Ziyuan Xu --- drivers/media/rc/ir-lirc-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index f928ffd7857a..dac46a3e6939 100644 --- a/drivers/media/rc/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c @@ -279,7 +279,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd, case LIRC_GET_MIN_TIMEOUT: if (!dev->max_timeout) return -ENOSYS; - val = dev->min_timeout / 1000; + val = DIV_ROUND_UP(dev->min_timeout, 1000); break; case LIRC_GET_MAX_TIMEOUT: