Commit f73fee74 authored by Jiri Kosina's avatar Jiri Kosina

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

Small hid-i2c acpi cleanup.
parents 7a8c1c4e 8afede12
...@@ -892,10 +892,10 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client, ...@@ -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) static void i2c_hid_acpi_fix_up_power(struct device *dev)
{ {
acpi_handle handle = ACPI_HANDLE(dev);
struct acpi_device *adev; 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); acpi_device_fix_up_power(adev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment