xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.4-rc5 into driver-core-next

Browse Source 
We want the sysfs fix in here as well to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2019-10-27 18:54:13 +01:00
parent a3caeb8ffe d6d5df1db6
commit 8f677bc819
1172 changed files with 11376 additions and 9592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/serial/sh-sci.c
View File

@@ -2895,8 +2895,12 @@ static int sci_init_single(struct platform_device *dev,
port->mapbase = res->start;
sci_port->reg_size = resource_size(res);
for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
sci_port->irqs[i] = platform_get_irq(dev, i);
for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i) {
if (i)
sci_port->irqs[i] = platform_get_irq_optional(dev, i);
else
sci_port->irqs[i] = platform_get_irq(dev, i);
}
/* The SCI generates several interrupts. They can be muxed together or
* connected to different interrupt lines. In the muxed case only one