diff options
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 75ba8608383e..f74af33f5ddc 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -674,7 +674,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) | |||
674 | client->dev.bus = &i2c_bus_type; | 674 | client->dev.bus = &i2c_bus_type; |
675 | client->dev.type = &i2c_client_type; | 675 | client->dev.type = &i2c_client_type; |
676 | client->dev.of_node = info->of_node; | 676 | client->dev.of_node = info->of_node; |
677 | ACPI_HANDLE_SET(&client->dev, info->acpi_node.handle); | 677 | ACPI_COMPANION_SET(&client->dev, info->acpi_node.companion); |
678 | 678 | ||
679 | /* For 10-bit clients, add an arbitrary offset to avoid collisions */ | 679 | /* For 10-bit clients, add an arbitrary offset to avoid collisions */ |
680 | dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), | 680 | dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), |
@@ -1103,7 +1103,7 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, | |||
1103 | return AE_OK; | 1103 | return AE_OK; |
1104 | 1104 | ||
1105 | memset(&info, 0, sizeof(info)); | 1105 | memset(&info, 0, sizeof(info)); |
1106 | info.acpi_node.handle = handle; | 1106 | info.acpi_node.companion = adev; |
1107 | info.irq = -1; | 1107 | info.irq = -1; |
1108 | 1108 | ||
1109 | INIT_LIST_HEAD(&resource_list); | 1109 | INIT_LIST_HEAD(&resource_list); |