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

Merge remote-tracking branch 'grant/devicetree/next' into for-next

Browse Source
This commit is contained in:
Rob Herring
2013-11-07 10:34:46 -06:00
parent e363bbac31 355e62f5ad
commit b5480950c6
505 changed files with 4155 additions and 2570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/cpm_uart/cpm_uart_core.c
View File

@@ -1209,7 +1209,7 @@ static int cpm_uart_init_port(struct device_node *np,
pinfo->port.fifosize = pinfo->tx_nrfifos * pinfo->tx_fifosize;
spin_lock_init(&pinfo->port.lock);
pinfo->port.irq = of_irq_to_resource(np, 0, NULL);
pinfo->port.irq = irq_of_parse_and_map(np, 0);
if (pinfo->port.irq == NO_IRQ) {
ret = -EINVAL;
goto out_pram;