summaryrefslogtreecommitdiff
path: root/drivers/tty/serdev
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-12-25 21:50:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-09 16:49:27 +0100
commit7d09995dcb0577b4a56aad7f2bb56f28604e8f1a (patch)
tree4926d58273be7e7aa93a4008dc5f3c0125613ceb /drivers/tty/serdev
parentea507ce3e05a462e170db4b6af1002fb0ed72916 (diff)
downloadlinux-next-7d09995dcb0577b4a56aad7f2bb56f28604e8f1a.tar.gz
serdev: Fix serdev_uevent failure on ACPI enumerated serdev-controllers
ACPI enumerated serdev-controllers do not have an ACPI companion, the ACPI companion belongs to the serdev-device child of the serdev-controller, not to the controller itself. This was causing serdev_uevent to always return -ENODEV when called on a serdev-controller leading to errors like these: kernel: serial serial0: uevent: failed to send synthetic uevent being logged. This commit modifies serdev_uevent to directly return 0 when called on an ACPI enumerated serdev-controller fixing this. Note: I do not think that setting a modalias on a devicetree enumerated serdev-controller makes sense either. So perhaps the !dev->of_node part of the check can be dropped too, but I'm not entirely sure that doing this on devicetree too is correct. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serdev')
-rw-r--r--drivers/tty/serdev/core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index 28133dbd2808..5dc88f61f506 100644
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -54,6 +54,11 @@ static int serdev_uevent(struct device *dev, struct kobj_uevent_env *env)
int rc;
/* TODO: platform modalias */
+
+ /* ACPI enumerated controllers do not have a modalias */
+ if (!dev->of_node && dev->type == &serdev_ctrl_type)
+ return 0;
+
rc = acpi_device_uevent_modalias(dev, env);
if (rc != -ENODEV)
return rc;