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

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 653d5637a37c..93a16ee14a9f 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -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;