Skip to content

Commit b647e7c

Browse files
6by9pelwell
authored andcommitted
serial: pl011: Initialise the hrtimers for RS485 on pl011_axi
pl011_axi_probe was missing the equivlent hrtimer initialisation from commit 2c1fd53 ("serial: amba-pl011: Fix RTS handling in RS485 mode") and commit 8cb4418 ("serial: amba-pl011: Switch to use hrtimer_setup()") resulting in the kernel blowing up as soon as pl011_rs485_stop_tx tried to use them. Add the hrtimer initialisation. Fixes: 120c89e ("serial: pl011: rp1 uart support") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent 5537f0a commit b647e7c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/tty/serial/amba-pl011.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3098,6 +3098,11 @@ static int pl011_axi_probe(struct platform_device *pdev)
30983098

30993099
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
31003100

3101+
hrtimer_init(&uap->trigger_start_tx, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
3102+
hrtimer_init(&uap->trigger_stop_tx, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
3103+
uap->trigger_start_tx.function = pl011_trigger_start_tx;
3104+
uap->trigger_stop_tx.function = pl011_trigger_stop_tx;
3105+
31013106
ret = pl011_setup_port(&pdev->dev, uap, r, portnr);
31023107
if (ret)
31033108
return ret;

0 commit comments

Comments
 (0)