summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-01 00:25:03 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-02 15:30:41 +0200
commitb34bb1ee71158d5b0f9028fb98afd026202bcfe9 (patch)
treec3887142e31c3621bd591a19e456e02237425647 /drivers/acpi
parent29896178cff0cd6e4ee78edc26158cc197a6b504 (diff)
downloadtalos-obmc-linux-b34bb1ee71158d5b0f9028fb98afd026202bcfe9.tar.gz
talos-obmc-linux-b34bb1ee71158d5b0f9028fb98afd026202bcfe9.zip
ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
The ACPI handle of struct i2c_adapter's dev member should not be set, because this causes that struct i2c_adapter to be associated with the ACPI device node corresponding to its parent as the second "physical_device", which is incorrect (this happens during the registration of struct i2c_adapter). Consequently, acpi_i2c_register_devices() should use the ACPI handle of the parent of the struct i2c_adapter it is called for rather than the struct i2c_adapter's ACPI handle (which should be NULL). Make that happen and modify the i2c-designware-platdrv driver, which currently is the only driver for ACPI-enumerated I2C controller chips, not to set the ACPI handle for the struct i2c_adapter it creates. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Aaron Lu <aaron.lu@intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_i2c.c b/drivers/acpi/acpi_i2c.c
index 82045e3f5cac..a82c7626aa9b 100644
--- a/drivers/acpi/acpi_i2c.c
+++ b/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;
OpenPOWER on IntegriCloud