2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 249d2fbc8f37..1e0545a67959 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -518,8 +518,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)
 
         WARN_ON(mutex_lock_killable(&lirc_dev_lock));
 
-        if (ir->d.rdev)
-                rc_close(ir->d.rdev);
+        rc_close(ir->d.rdev);
 
         ir->open--;
         if (ir->attached) {
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 97dd6921edbe..86ffcd54339e 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1298,8 +1298,7 @@ void rc_free_device(struct rc_dev *dev)
         if (!dev)
                 return;
 
-        if (dev->input_dev)
-                input_free_device(dev->input_dev);
+        input_free_device(dev->input_dev);
 
         put_device(&dev->dev);