Skip to content

Commit b0ef7cd

Browse files
committed
Fix up remaining devm_ioremap_nocache() in SGI IOC3 8250 UART driver
This is a merge error on my part - the driver was merged into mainline by commit c5951e7 ("Merge tag 'mips_5.6' of git://../mips/linux") over a week ago, but nobody apparently noticed that it didn't actually build due to still having a reference to the devm_ioremap_nocache() function, removed a few days earlier through commit 6a1000b ("Merge tag 'ioremap-5.6' of git://../ioremap"). Apparently this didn't get any build testing anywhere. Not perhaps all that surprising: it's restricted to 64-bit MIPS only, and only with the new SGI_MFD_IOC3 support enabled. I only noticed because the ioremap conflicts in the ARM SoC driver update made me check there weren't any others hiding, and I found this one. Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4ef1a30 commit b0ef7cd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/tty/serial/8250/8250_ioc3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static int serial8250_ioc3_probe(struct platform_device *pdev)
4747
if (!data)
4848
return -ENOMEM;
4949

50-
membase = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));
50+
membase = devm_ioremap(&pdev->dev, r->start, resource_size(r));
5151
if (!membase)
5252
return -ENOMEM;
5353

0 commit comments

Comments
 (0)