diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-04 07:46:08 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-04 07:46:08 -0500 |
| commit | 6b728f1a906976ec658827adc9c2d27608aa8517 (patch) | |
| tree | b60bef25c8258b7b250f1d57ac0722cd742b3c96 /drivers/pnp | |
| parent | d9ba1025a46d368bc00a2981cb2b2a918e9209b7 (diff) | |
| parent | a6b5e88c0e42093b9057856f35770966c8c591e3 (diff) | |
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.c | 3 |
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) | |||
| 95 | return -ENODEV; | 95 | return -ENODEV; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | if (WARN_ON_ONCE(acpi_dev != dev->data)) | ||
| 99 | dev->data = acpi_dev; | ||
| 100 | |||
| 98 | ret = pnpacpi_build_resource_template(dev, &buffer); | 101 | ret = pnpacpi_build_resource_template(dev, &buffer); |
| 99 | if (ret) | 102 | if (ret) |
| 100 | return ret; | 103 | return ret; |