[PATCH 2/2] HID: wiimote: fix invalid power_supply_powers call
Luis Henriques
luis.henriques at canonical.com
Tue Sep 11 14:15:38 UTC 2012
From: Jiri Kosina <jkosina at suse.cz>
BugLink: http://bugs.launchpad.net/bugs/1048605
Analogically to d7cb3dbd1 ("HID: wacom: Fix invalid power_supply_powers
calls"), fix also the same occurence in wiimote driver.
Reported-by: przemo at firszt.eu
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit 217c8b2b1978aa4a02ce040a99c59ed3b6418fe5)
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/hid/hid-wiimote.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote.c
index 295901e..febcd9b 100644
--- a/drivers/hid/hid-wiimote.c
+++ b/drivers/hid/hid-wiimote.c
@@ -1251,14 +1251,14 @@ 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");
goto err_battery;
}
+ power_supply_powers(&wdata->battery, &hdev->dev);
+
ret = wiimote_leds_create(wdata);
if (ret)
goto err_free;
--
1.7.9.5
More information about the kernel-team
mailing list