HID: hid-input: fix compile for !HID_BATTERY_STRENGTH
authorJeremy Fitzhardinge <jeremy@goop.org>
Wed, 30 Nov 2011 13:42:04 +0000 (14:42 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 30 Nov 2011 13:42:08 +0000 (14:42 +0100)
As reported by Stephen Rothwell:
drivers/hid/hid-input.c: In function 'hidinput_hid_event':
drivers/hid/hid-input.c:865:6: error: 'struct hid_device' has no member
named 'battery_val'
drivers/hid/hid-input.c:866:3: error: 'struct hid_device' has no member
named 'battery_min'
drivers/hid/hid-input.c:866:3: error: 'struct hid_device' has no member
named 'battery_max'

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-input.c

index 2d96b782b203d4ae51b4ded032598257316fd90e..b9b8c75a6f9a8fc7f57ebdd67dd9b994c119fbb8 100644 (file)
@@ -861,13 +861,14 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 
        input = field->hidinput->input;
 
+#ifdef CONFIG_HID_BATTERY_STRENGTH
        if (usage->hid == HID_DC_BATTERYSTRENGTH) {
                hid->battery_val = value;
                hid_dbg(hid, "battery value is %d (range %d-%d)\n",
                        value, hid->battery_min, hid->battery_max);
                return;
        }
-
+#endif
        if (!usage->type)
                return;