From aadaf78ef07519170c4b299c44f3b770960a3239 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Fri, 30 Nov 2012 13:05:05 +0100
Subject: [PATCH] --- yaml --- r: 336765 b: refs/heads/master c:
 a6b5e88c0e42093b9057856f35770966c8c591e3 h: refs/heads/master i:   336763:
 9cc76d032d04c75dabeae76696577290b5f53a24 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/pnp/pnpacpi/core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2edb10eca60f..e9270e96597c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0c2ce16bec0afa6013b4c5220ca4c9c67210215
+refs/heads/master: a6b5e88c0e42093b9057856f35770966c8c591e3
diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c
index 26b5d4b18dd7..ec8e914f756c 100644
--- a/trunk/drivers/pnp/pnpacpi/core.c
+++ b/trunk/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;