diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2011-12-09 18:35:00 +0100 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2011-12-09 18:54:17 +0100 |
| commit | 35b4c01e29bdd9632dabf9784ed3486333f00427 (patch) | |
| tree | d189be2bec132117aefff67a3d17f7414ac1199c | |
| parent | power_supply: add scope properties to some self-powered HID devices (diff) | |
| download | linux-35b4c01e29bdd9632dabf9784ed3486333f00427.tar.xz linux-35b4c01e29bdd9632dabf9784ed3486333f00427.zip | |
power_supply: add "powers" links to self-powered HID devices
Make the relationship between the Wiimote and Wacom self-powered HID
devices and their power supply explicit by adding a "powers" link.
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-wacom.c | 4 | ||||
| -rw-r--r-- | drivers/hid/hid-wiimote.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index ad39777d1111..3d28e4988f69 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -397,6 +397,8 @@ static int wacom_probe(struct hid_device *hdev, wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; wdata->battery.use_for_apm = 0; + power_supply_powers(&wdata->battery, &hdev->dev); + ret = power_supply_register(&hdev->dev, &wdata->battery); if (ret) { hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n", @@ -411,6 +413,8 @@ static int wacom_probe(struct hid_device *hdev, wdata->ac.type = POWER_SUPPLY_TYPE_MAINS; wdata->ac.use_for_apm = 0; + power_supply_powers(&wdata->battery, &hdev->dev); + ret = power_supply_register(&hdev->dev, &wdata->ac); if (ret) { hid_warn(hdev, diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote.c index 98e48281c0b2..fc0b4db5dab3 100644 --- a/drivers/hid/hid-wiimote.c +++ b/drivers/hid/hid-wiimote.c @@ -1263,6 +1263,8 @@ static int wiimote_hid_probe(struct hid_device *hdev, wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; wdata->battery.use_for_apm = 0; + power_supply_powers(&wdata->battery, &hdev->dev); + ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); if (ret) { hid_err(hdev, "Cannot register battery device\n"); |