Merge tag 'tty-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (5a96c0bb) · Commits · 戴 / test

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

drivers/tty/serdev/core.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,12 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
		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,
		void data, void *return_value)
		{
		@@ -675,6 +681,10 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
		if (acpi_device_enumerated(adev))
		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))
		return AE_OK;

drivers/tty/tty_port.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ void tty_port_link_device(struct tty_port *port,
		{
		if (WARN_ON(index >= driver->num))
		return;
		if (!driver->ports[index])
		driver->ports[index] = port;
		}
		EXPORT_SYMBOL_GPL(tty_port_link_device);

Admin message