TTY: irq: Remove IRQF_DISABLED

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / sh-sci.c

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index d0a56235c50eedc5e9ed4dd9097e0b86b504ebda..ca1a4c385d400e32e9435198aaab62b901edbb58 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1889,7 +1889,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
 
        if (p->regtype == SCIx_PROBE_REGTYPE) {
                ret = sci_probe_regmap(p);
-               if (unlikely(!ret))
+               if (unlikely(ret))
                        return ret;
        }
 
@@ -1961,7 +1961,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
         * For the muxed case there's nothing more to do.
         */
        port->irq               = p->irqs[SCIx_RXI_IRQ];
-       port->irqflags          = IRQF_DISABLED;
+       port->irqflags          = 0;
 
        port->serial_in         = sci_serial_in;
        port->serial_out        = sci_serial_out;