Skip to content

Commit f356d7a

Browse files
groeckgregkh
authored andcommitted
serial: etraxfs-uart: Fix crash
Since commit 7d8c70d ("serial: mctrl-gpio: rename init function"), crisv32 either do not build or crash as follows. Unable to handle kernel NULL pointer dereference Linux 4.3.0-rc7-next-20151101 #1 Sun Nov 1 11:41:28 PST 2015 ... Call Trace: [<c0004a0e>] show_stack+0x0/0x9e [<c004c0c0>] printk+0x0/0x2c [<c00059d4>] show_registers+0x14a/0x1c2 [<c004c0c0>] printk+0x0/0x2c [<c0004b52>] die_if_kernel+0x7c/0x9e [<c0005346>] do_page_fault+0x32e/0x3e6 [<c01dc59c>] of_get_property+0x0/0x2c [<c01e0558>] of_irq_parse_raw+0x12a/0x376 [<c01dc59c>] of_get_property+0x0/0x2c [<c0053aca>] get_page_from_freelist+0x73e/0x856 [<c01dc59c>] of_get_property+0x0/0x2c [<c0008912>] d_mmu_refill+0x10a/0x112 [<c01b488c>] devm_kmalloc+0x40/0x56 [<c01b47d0>] add_dr+0xc/0x1c [<c01b4800>] devm_add_action+0x2/0x4e [<c01abdbc>] mctrl_gpio_init_noauto+0x1c/0x76 [<c01abf9e>] mctrl_gpio_init+0x22/0x110 The function call in the etraxfs-uart driver was not renamed, possibly due to interference with commit 7b9c516 ("serial: etraxfs-uart: use mctrl_gpio helpers for handling modem signals"). Fixes: 7d8c70d ("serial: mctrl-gpio: rename init function") Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Acked-by: Niklas Cassel <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bec8bf6 commit f356d7a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/tty/serial/etraxfs-uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ static int etraxfs_uart_probe(struct platform_device *pdev)
894894
up->regi_ser = of_iomap(np, 0);
895895
up->port.dev = &pdev->dev;
896896

897-
up->gpios = mctrl_gpio_init(&pdev->dev, 0);
897+
up->gpios = mctrl_gpio_init_noauto(&pdev->dev, 0);
898898
if (IS_ERR(up->gpios))
899899
return PTR_ERR(up->gpios);
900900

0 commit comments

Comments
 (0)