Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -1936,7 +1936,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
|
||||
@@ -1952,6 +1952,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]);
|
||||
|
||||
|
Reference in New Issue
Block a user