diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-11 12:52:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-11 12:52:51 +0100 |
| commit | dc14b5fe7d0a1e37e9388964614676e4166b2953 (patch) | |
| tree | 4f4f3aed094446b3e5daedd8710ccd831943490f /drivers/tty/serial/sh-sci.c | |
| parent | bae54dc4f353653bbd3e3081754adad05da1d4dd (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
| download | linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.tar.gz linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.tar.bz2 linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.zip | |
Merge tag 'v5.0-rc6' into x86/fpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 8df0fd824520..64bbeb7d7e0c 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1921,7 +1921,7 @@ out_nomem: static void sci_free_irq(struct sci_port *port) { - int i; + int i, j; /* * Intentionally in reverse order so we iterate over the muxed @@ -1937,6 +1937,13 @@ static void sci_free_irq(struct sci_port *port) if (unlikely(irq < 0)) continue; + /* Check if already freed (irq was muxed) */ + for (j = 0; j < i; j++) + if (port->irqs[j] == irq) + j = i + 1; + if (j > i) + continue; + free_irq(port->irqs[i], port); kfree(port->irqstr[i]); |