simserial, bail out when request_irq fails
authorJiri Slaby <jslaby@suse.cz>
Thu, 8 Mar 2012 20:01:19 +0000 (21:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Mar 2012 20:26:31 +0000 (12:26 -0800)
Without this, the code succeeds when the port is opened by root and we
get unwanted interrupts storm on the first key stroke.

Instead of that, tell the user we failed and that we won't continue. I
suppose, the code was copied from the serial layer where we may want
to change the irq number, so we must allow open even of the failing
port. This is not the case for this driver at all.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/ia64/hp/sim/simserial.c

index 3a079decde517e0f93c669a6ed81447c7440db9b..8f68972b015f0b6d03bc2681570b057f3532a40f 100644 (file)
@@ -692,15 +692,8 @@ startup(struct async_struct *info)
                        handler = rs_interrupt_single;
 
                retval = request_irq(state->irq, handler, IRQ_T(info), "simserial", NULL);
-               if (retval) {
-                       if (capable(CAP_SYS_ADMIN)) {
-                               if (info->tty)
-                                       set_bit(TTY_IO_ERROR,
-                                               &info->tty->flags);
-                               retval = 0;
-                       }
+               if (retval)
                        goto errout;
-               }
        }
 
        /*