diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-07-24 13:01:40 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-25 18:53:53 -0700 |
| commit | dd3181a70cb73c4f40cfe33ecdd6260ff3fbf8cc (patch) | |
| tree | 08570be6473ef8befcfe959b854da0088191df6b /drivers/input/tablet | |
| parent | Input: wacom - remove usb dependency for siblings devices (diff) | |
| download | linux-dev-dd3181a70cb73c4f40cfe33ecdd6260ff3fbf8cc.tar.xz linux-dev-dd3181a70cb73c4f40cfe33ecdd6260ff3fbf8cc.zip | |
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')
| -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) wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY; wacom->battery.use_for_apm = 0; - error = power_supply_register(&wacom->usbdev->dev, + error = power_supply_register(&wacom->hdev->dev, &wacom->battery); if (!error) power_supply_powers(&wacom->battery, - &wacom->usbdev->dev); + &wacom->hdev->dev); } return error; |