From 0b9127027effa0be8101a8ac767f5d0c5dba00e5 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 7 Feb 2012 13:40:56 +0100 Subject: [PATCH] --- yaml --- r: 287284 b: refs/heads/master c: 217c8b2b1978aa4a02ce040a99c59ed3b6418fe5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-wiimote-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3edfb5d165ec..fbd8e633134d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7cb3dbd10c09081fafd05fcbef590ce04e402ff +refs/heads/master: 217c8b2b1978aa4a02ce040a99c59ed3b6418fe5 diff --git a/trunk/drivers/hid/hid-wiimote-core.c b/trunk/drivers/hid/hid-wiimote-core.c index fc253b472f9d..cac3589b1ed5 100644 --- a/trunk/drivers/hid/hid-wiimote-core.c +++ b/trunk/drivers/hid/hid-wiimote-core.c @@ -1226,14 +1226,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;