diff options
| author | Dmitry Torokhov | 2018-10-22 21:04:33 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2018-10-22 21:04:33 +0200 |
| commit | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch) | |
| tree | 59281a932bf0b3d736044eb33067cf1507ada1d7 /drivers/input/serio | |
| parent | Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM (diff) | |
| parent | Input: synaptics - avoid using uninitialized variable when probing (diff) | |
| download | kernel-qcow2-linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.gz kernel-qcow2-linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.xz kernel-qcow2-linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 07de1b49293c..6615c02a08fd 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c @@ -245,7 +245,7 @@ static int xps2_of_probe(struct platform_device *ofdev) unsigned int irq; int error; - dev_info(dev, "Device Tree Probing \'%s\'\n", dev->of_node->name); + dev_info(dev, "Device Tree Probing \'%pOFn\'\n", dev->of_node); /* Get iospace for the device */ error = of_address_to_resource(dev->of_node, 0, &r_mem); |