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

Small hid-i2c acpi cleanup.
mariux64 · Apr 5, 2018 · f73fee7 · f73fee7
2 parents 7a8c1c4 + 8afede1
commit f73fee7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);
 }