Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 0167e0e0bf889d6ed920b72e4024e737ed574873..176b43670e5da9f7de6c906a56dfb007f0b160cf 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -516,10 +516,10 @@ struct hid_device {                                                       /* device report descriptor */
 #ifdef CONFIG_HID_BATTERY_STRENGTH
        /*
         * Power supply information for HID devices which report
-        * battery strength. power_supply is registered iff
-        * battery.name is non-NULL.
+        * battery strength. power_supply was successfully registered if
+        * battery is non-NULL.
         */
-       struct power_supply battery;
+       struct power_supply *battery;
        __s32 battery_min;
        __s32 battery_max;
        __s32 battery_report_type;