|
@@ -462,12 +462,15 @@ out:
|
|
|
|
|
|
static void hidinput_cleanup_battery(struct hid_device *dev)
|
|
static void hidinput_cleanup_battery(struct hid_device *dev)
|
|
{
|
|
{
|
|
|
|
+ const struct power_supply_desc *psy_desc;
|
|
|
|
+
|
|
if (!dev->battery)
|
|
if (!dev->battery)
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
+ psy_desc = dev->battery->desc;
|
|
power_supply_unregister(dev->battery);
|
|
power_supply_unregister(dev->battery);
|
|
- kfree(dev->battery->desc->name);
|
|
|
|
- kfree(dev->battery->desc);
|
|
|
|
|
|
+ kfree(psy_desc->name);
|
|
|
|
+ kfree(psy_desc);
|
|
dev->battery = NULL;
|
|
dev->battery = NULL;
|
|
}
|
|
}
|
|
#else /* !CONFIG_HID_BATTERY_STRENGTH */
|
|
#else /* !CONFIG_HID_BATTERY_STRENGTH */
|