diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 12:13:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 12:13:05 +0100 |
| commit | a6184f8e0bb1ba8b444836926cd6967ea176fd31 (patch) | |
| tree | 34a580e0122747087740436055e834f295b414e4 /drivers/tty/serdev | |
| parent | 477b8383100023ea0769979cff67e9be3a720397 (diff) | |
| parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
| download | linux-a6184f8e0bb1ba8b444836926cd6967ea176fd31.tar.gz linux-a6184f8e0bb1ba8b444836926cd6967ea176fd31.tar.bz2 linux-a6184f8e0bb1ba8b444836926cd6967ea176fd31.zip | |
Merge 5.5-rc6 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serdev')
| -rw-r--r-- | drivers/tty/serdev/core.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index e50665425902..42345e79920c 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -665,6 +665,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) { @@ -677,6 +683,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; |