AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 19:07:32 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

TTY/Serial fixes for 5.5-rc6

Browse Source 
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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCXhjdnA8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+ynu9wCeK2+UkGRHnRu36Gnct0GitHsfYucAn35UwsfR
 +R9QXskGEDl5NdWkPG77
 =BTqO
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-01-10 13:17:21 -08:00
commit 5a96c0bbff
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/serdev/core.c
View File

@ -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;

3
drivers/tty/tty_port.c
View File

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