Merge branch 'for-4.17/hid-i2c' into for-linus

Small hid-i2c acpi cleanup.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index e6f413a2b1e9..97689e98e53f 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -892,10 +892,10 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client,
 
 static void i2c_hid_acpi_fix_up_power(struct device *dev)
 {
-        acpi_handle handle = ACPI_HANDLE(dev);
         struct acpi_device *adev;
 
-        if (handle && acpi_bus_get_device(handle, &adev) == 0)
+        adev = ACPI_COMPANION(dev);
+        if (adev)
                 acpi_device_fix_up_power(adev);
 }