From 8934db5ea36c683d92019601a68747bfba62d595 Mon Sep 17 00:00:00 2001
From: Sean Young <sean@mess.org>
Date: Mon, 12 Feb 2018 08:59:00 -0500
Subject: [PATCH] UPSTREAM: media: rc: remove useless if statement

ret is always 0, so remove if statement.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
(cherry picked from commit c2837ad09018807437f1249d30915e70dd6b6bbe)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
---
 drivers/media/rc/lirc_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 5c70c0125b5c..582197457b34 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -574,7 +574,7 @@ static long ir_lirc_ioctl(struct file *file, unsigned int cmd,
 				ret = -EINVAL;
 			else if (dev->s_timeout)
 				ret = dev->s_timeout(dev, tmp);
-			else if (!ret)
+			else
 				dev->timeout = tmp;
 		}
 		break;