[PATCH 03/16] lirc_dev: correct error handling

[David Härdeman]

If an error is generated, nonseekable_open() shouldn't be called.

Signed-off-by: David Härdeman <da...@hardeman.nu>
---
 drivers/media/rc/lirc_dev.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 05f600bd6c67..7f13ed479e1c 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -431,7 +431,7 @@ EXPORT_SYMBOL(lirc_unregister_driver);
 int lirc_dev_fop_open(struct inode *inode, struct file *file)
 {
        struct irctl *ir;
-       int retval = 0;
+       int retval;
 
        if (iminor(inode) >= MAX_IRCTL_DEVICES) {
                pr_err("open result for %d is -ENODEV\n", iminor(inode));
@@ -475,9 +475,11 @@ int lirc_dev_fop_open(struct inode *inode, struct file 
*file)
 
        ir->open++;
 
-error:
        nonseekable_open(inode, file);
 
+       return 0;
+
+error:
        return retval;
 }
 EXPORT_SYMBOL(lirc_dev_fop_open);