diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
| commit | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch) | |
| tree | 59281a932bf0b3d736044eb33067cf1507ada1d7 /drivers/input/keyboard | |
| parent | 13c1c5e4d7f887cba36c5e3df3faa22071c1469f (diff) | |
| parent | f39f8688888ae74fa8deae2d01289b69b4727394 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/sun4i-lradc-keys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c index a37c172452e6..57272df34cd5 100644 --- a/drivers/input/keyboard/sun4i-lradc-keys.c +++ b/drivers/input/keyboard/sun4i-lradc-keys.c @@ -185,19 +185,19 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, error = of_property_read_u32(pp, "channel", &channel); if (error || channel != 0) { - dev_err(dev, "%s: Inval channel prop\n", pp->name); + dev_err(dev, "%pOFn: Inval channel prop\n", pp); return -EINVAL; } error = of_property_read_u32(pp, "voltage", &map->voltage); if (error) { - dev_err(dev, "%s: Inval voltage prop\n", pp->name); + dev_err(dev, "%pOFn: Inval voltage prop\n", pp); return -EINVAL; } error = of_property_read_u32(pp, "linux,code", &map->keycode); if (error) { - dev_err(dev, "%s: Inval linux,code prop\n", pp->name); + dev_err(dev, "%pOFn: Inval linux,code prop\n", pp); return -EINVAL; } |