mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'acpi-general'
* acpi-general: ACPI / PNP: Do not crash due to stale pointer use during system resume ACPI / video: Add "Asus UL30VT" to ACPI video detect blacklist ACPI: do acpisleep dmi check when CONFIG_ACPI_SLEEP is set
This commit is contained in:
commit
6b728f1a90
3 changed files with 188 additions and 171 deletions
|
|
@ -95,6 +95,9 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (WARN_ON_ONCE(acpi_dev != dev->data))
|
||||
dev->data = acpi_dev;
|
||||
|
||||
ret = pnpacpi_build_resource_template(dev, &buffer);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Reference in a new issue