summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-04 13:46:08 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-04 13:46:08 +0100
commit6b728f1a906976ec658827adc9c2d27608aa8517 (patch)
treeb60bef25c8258b7b250f1d57ac0722cd742b3c96 /drivers/pnp
parentd9ba1025a46d368bc00a2981cb2b2a918e9209b7 (diff)
parenta6b5e88c0e42093b9057856f35770966c8c591e3 (diff)
downloadlinux-6b728f1a906976ec658827adc9c2d27608aa8517.tar.gz
linux-6b728f1a906976ec658827adc9c2d27608aa8517.tar.bz2
linux-6b728f1a906976ec658827adc9c2d27608aa8517.zip
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
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/pnpacpi/core.c3
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;