diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2018-11-06 13:57:02 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-11-06 13:57:02 +0100 |
| commit | 0c7244209588630a9b45e52490ef1390e04499a6 (patch) | |
| tree | d60f5610f9b36ff05ed5202396c811628bacdb61 /drivers/tty/ehv_bytechan.c | |
| parent | HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override (diff) | |
| parent | Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86 (diff) | |
| download | linux-dev-0c7244209588630a9b45e52490ef1390e04499a6.tar.xz linux-dev-0c7244209588630a9b45e52490ef1390e04499a6.zip | |
Merge branch 'master' into for-4.20/upstream-fixes
Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.
Diffstat (limited to 'drivers/tty/ehv_bytechan.c')
| -rw-r--r-- | drivers/tty/ehv_bytechan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c index eea4049b5dcc..769e0a5d1dfc 100644 --- a/drivers/tty/ehv_bytechan.c +++ b/drivers/tty/ehv_bytechan.c @@ -128,8 +128,8 @@ static int find_console_handle(void) */ iprop = of_get_property(np, "hv-handle", NULL); if (!iprop) { - pr_err("ehv-bc: no 'hv-handle' property in %s node\n", - np->name); + pr_err("ehv-bc: no 'hv-handle' property in %pOFn node\n", + np); return 0; } stdout_bc = be32_to_cpu(*iprop); @@ -661,8 +661,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) iprop = of_get_property(np, "hv-handle", NULL); if (!iprop) { - dev_err(&pdev->dev, "no 'hv-handle' property in %s node\n", - np->name); + dev_err(&pdev->dev, "no 'hv-handle' property in %pOFn node\n", + np); return -ENODEV; } @@ -682,8 +682,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) bc->rx_irq = irq_of_parse_and_map(np, 0); bc->tx_irq = irq_of_parse_and_map(np, 1); if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) { - dev_err(&pdev->dev, "no 'interrupts' property in %s node\n", - np->name); + dev_err(&pdev->dev, "no 'interrupts' property in %pOFn node\n", + np); ret = -ENODEV; goto error; } |