]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
[IA64] simserial, bail out when request_irq fails
authorJiri Slaby <jslaby@suse.cz>
Fri, 24 Feb 2012 11:10:18 +0000 (12:10 +0100)
committerTony Luck <tony.luck@intel.com>
Fri, 24 Feb 2012 22:26:05 +0000 (14: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>
arch/ia64/hp/sim/simserial.c

index 797e89a6c4eb2cd7611e4513cc3117a63d9aedd6..60c9093bbeae9a39edbbce9929bc43c7b0fc1d7e 100644 (file)
@@ -702,15 +702,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;
-               }
        }
 
        /*