summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2018-11-15 21:09:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 09:19:57 +0100
commitd18f228f504eb7ab0cf434d7a87855c69fc638f8 (patch)
tree2b37a08ec959d39039831796b6abd38dfcf1220c /drivers/input/serio
parent72a50a1e1c6572b34e783c9e872eeb9fe0863994 (diff)
downloadlinux-stable-d18f228f504eb7ab0cf434d7a87855c69fc638f8.tar.gz
linux-stable-d18f228f504eb7ab0cf434d7a87855c69fc638f8.tar.bz2
linux-stable-d18f228f504eb7ab0cf434d7a87855c69fc638f8.zip
parisc: Fix serio address output
[ Upstream commit 785145171d17af2554128becd6a7c8f89e101141 ] We want the hpa addresses printed in the serio modules, not some virtual ioremap()ed address, e.g.: serio: gsc-ps2-keyboard port at 0xf0108000 irq 22 @ 2:0:11 serio: gsc-ps2-mouse port at 0xf0108100 irq 22 @ 2:0:12 Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/gscps2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 49d8d53e50b7..96f9b5397367 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -381,9 +381,9 @@ static int __init gscps2_probe(struct parisc_device *dev)
goto fail;
#endif
- printk(KERN_INFO "serio: %s port at 0x%p irq %d @ %s\n",
+ pr_info("serio: %s port at 0x%08lx irq %d @ %s\n",
ps2port->port->name,
- ps2port->addr,
+ hpa,
ps2port->padev->irq,
ps2port->port->phys);