diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-07-24 16:01:40 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-25 21:53:53 -0400 |
commit | dd3181a70cb73c4f40cfe33ecdd6260ff3fbf8cc (patch) | |
tree | 08570be6473ef8befcfe959b854da0088191df6b /drivers/input/tablet/wacom_sys.c | |
parent | 4451e088cf01184379da1b212913fdde6e9943c5 (diff) |
Input: wacom - register power device at the HID level
Use the HID device as the parent for the power device when dealing with
a wireless receiver.
Removes one more usb dependency and does not break user space.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 8065bac5fcb3..b8710594185a 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -966,12 +966,12 @@ static int wacom_initialize_battery(struct wacom *wacom) | |||
966 | wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY; | 966 | wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY; |
967 | wacom->battery.use_for_apm = 0; | 967 | wacom->battery.use_for_apm = 0; |
968 | 968 | ||
969 | error = power_supply_register(&wacom->usbdev->dev, | 969 | error = power_supply_register(&wacom->hdev->dev, |
970 | &wacom->battery); | 970 | &wacom->battery); |
971 | 971 | ||
972 | if (!error) | 972 | if (!error) |
973 | power_supply_powers(&wacom->battery, | 973 | power_supply_powers(&wacom->battery, |
974 | &wacom->usbdev->dev); | 974 | &wacom->hdev->dev); |
975 | } | 975 | } |
976 | 976 | ||
977 | return error; | 977 | return error; |