leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power_supply: add "powers" links to self-powered HID devices

Browse Source 
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>
This commit is contained in:
Jeremy Fitzhardinge 2011-12-09 09:35:00 -08:00
parent 73db88137b
commit 35b4c01e29
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/hid-wacom.c
View File

@ -397,6 +397,8 @@ static int wacom_probe(struct hid_device *hdev,
wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
wdata->battery.use_for_apm = 0; wdata->battery.use_for_apm = 0;
power_supply_powers(&wdata->battery, &hdev->dev);
ret = power_supply_register(&hdev->dev, &wdata->battery); ret = power_supply_register(&hdev->dev, &wdata->battery);
if (ret) { if (ret) {
hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n", 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.type = POWER_SUPPLY_TYPE_MAINS;
wdata->ac.use_for_apm = 0; wdata->ac.use_for_apm = 0;
power_supply_powers(&wdata->battery, &hdev->dev);
ret = power_supply_register(&hdev->dev, &wdata->ac); ret = power_supply_register(&hdev->dev, &wdata->ac);
if (ret) { if (ret) {
hid_warn(hdev, hid_warn(hdev,

2
drivers/hid/hid-wiimote.c
View File

@ -1263,6 +1263,8 @@ static int wiimote_hid_probe(struct hid_device *hdev,
wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
wdata->battery.use_for_apm = 0; wdata->battery.use_for_apm = 0;
power_supply_powers(&wdata->battery, &hdev->dev);
ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
if (ret) { if (ret) {
hid_err(hdev, "Cannot register battery device\n"); hid_err(hdev, "Cannot register battery device\n");