Commit 5a96c0bb authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'tty-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial fixes from Greg KH:
 "Here are two tty/serial driver fixes for 5.5-rc6.

  The first fixes a much much reported issue with a previous tty port
  link patch that is in your tree, and the second fixes a problem where
  the serdev driver would claim ACPI devices that it shouldn't be
  claiming.

  Both have been in linux-next for a while with no reported issues"

* tag 'tty-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serdev: Don't claim unsupported ACPI serial devices
  tty: always relink the port
parents 4e4cd21c c5ee0b31
...@@ -663,6 +663,12 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl, ...@@ -663,6 +663,12 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
return AE_OK; return AE_OK;
} }
static const struct acpi_device_id serdev_acpi_devices_blacklist[] = {
{ "INT3511", 0 },
{ "INT3512", 0 },
{ },
};
static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
void *data, void **return_value) void *data, void **return_value)
{ {
...@@ -675,6 +681,10 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, ...@@ -675,6 +681,10 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
if (acpi_device_enumerated(adev)) if (acpi_device_enumerated(adev))
return AE_OK; return AE_OK;
/* Skip if black listed */
if (!acpi_match_device_ids(adev, serdev_acpi_devices_blacklist))
return AE_OK;
if (acpi_serdev_check_resources(ctrl, adev)) if (acpi_serdev_check_resources(ctrl, adev))
return AE_OK; return AE_OK;
......
...@@ -89,8 +89,7 @@ void tty_port_link_device(struct tty_port *port, ...@@ -89,8 +89,7 @@ void tty_port_link_device(struct tty_port *port,
{ {
if (WARN_ON(index >= driver->num)) if (WARN_ON(index >= driver->num))
return; return;
if (!driver->ports[index]) driver->ports[index] = port;
driver->ports[index] = port;
} }
EXPORT_SYMBOL_GPL(tty_port_link_device); EXPORT_SYMBOL_GPL(tty_port_link_device);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment