diff options
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-sony.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-wiimote-modules.c | 2 | ||||
| -rw-r--r-- | drivers/hid/wacom_sys.c | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 052869d..6182265 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -439,7 +439,7 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type, dev->battery_report_type = report_type; dev->battery_report_id = field->report->id; - ret = power_supply_register(&dev->dev, battery); + ret = power_supply_register(&dev->dev, battery, NULL); if (ret != 0) { hid_warn(dev, "can't register power supply: %d\n", ret); kfree(battery->name); diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 31e9d25..16fc6a1 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -1718,7 +1718,7 @@ static int sony_battery_probe(struct sony_sc *sc) if (!sc->battery.name) return -ENOMEM; - ret = power_supply_register(&hdev->dev, &sc->battery); + ret = power_supply_register(&hdev->dev, &sc->battery, NULL); if (ret) { hid_err(hdev, "Unable to register battery device\n"); goto err_free; diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c index 6b61f01..91cb00a 100644 --- a/drivers/hid/hid-wiimote-modules.c +++ b/drivers/hid/hid-wiimote-modules.c @@ -250,7 +250,7 @@ static int wiimod_battery_probe(const struct wiimod_ops *ops, if (!wdata->battery.name) return -ENOMEM; - ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); + ret = power_supply_register(&wdata->hdev->dev, &wdata->battery, NULL); if (ret) { hid_err(wdata->hdev, "cannot register battery device\n"); goto err_free; diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index f0568a7..148949c0 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1021,13 +1021,14 @@ static int wacom_initialize_battery(struct wacom *wacom) wacom->ac.use_for_apm = 0; error = power_supply_register(&wacom->hdev->dev, - &wacom->battery); + &wacom->battery, NULL); if (error) return error; power_supply_powers(&wacom->battery, &wacom->hdev->dev); - error = power_supply_register(&wacom->hdev->dev, &wacom->ac); + error = power_supply_register(&wacom->hdev->dev, &wacom->ac, + NULL); if (error) { power_supply_unregister(&wacom->battery); return error; |