From 557eeb092d54efec51d3b9a50dac7d73781cadac Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Mon, 1 Apr 2013 00:25:03 +0000
Subject: [PATCH] --- yaml --- r: 362199 b: refs/heads/master c:
 b34bb1ee71158d5b0f9028fb98afd026202bcfe9 h: refs/heads/master i:   362197:
 791ca64f5c5a9f928ed4b349ac0d93037eaa6ef6   362195:
 e4d7047ca0e8c2e407602a3482c3ec3ab1e0a717   362191:
 a26a3722679b03bdf50cfad35043738ab7dfcb3a v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/acpi/acpi_i2c.c                     | 2 +-
 trunk/drivers/i2c/busses/i2c-designware-platdrv.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5853c9ed45e..c32580d1750d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29896178cff0cd6e4ee78edc26158cc197a6b504
+refs/heads/master: b34bb1ee71158d5b0f9028fb98afd026202bcfe9
diff --git a/trunk/drivers/acpi/acpi_i2c.c b/trunk/drivers/acpi/acpi_i2c.c
index 82045e3f5cac..a82c7626aa9b 100644
--- a/trunk/drivers/acpi/acpi_i2c.c
+++ b/trunk/drivers/acpi/acpi_i2c.c
@@ -90,7 +90,7 @@ void acpi_i2c_register_devices(struct i2c_adapter *adapter)
 	acpi_handle handle;
 	acpi_status status;
 
-	handle = ACPI_HANDLE(&adapter->dev);
+	handle = ACPI_HANDLE(adapter->dev.parent);
 	if (!handle)
 		return;
 
diff --git a/trunk/drivers/i2c/busses/i2c-designware-platdrv.c b/trunk/drivers/i2c/busses/i2c-designware-platdrv.c
index 0ceb6e1b0f65..e3085c487ace 100644
--- a/trunk/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/trunk/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -182,7 +182,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
 	adap->algo = &i2c_dw_algo;
 	adap->dev.parent = &pdev->dev;
 	adap->dev.of_node = pdev->dev.of_node;
-	ACPI_HANDLE_SET(&adap->dev, ACPI_HANDLE(&pdev->dev));
 
 	r = i2c_add_numbered_adapter(adap);
 	if (r) {