HID: apple: avoid setting up battery timer for devices without battery

Currently, the battery timer is set up for all devices using hid-apple,
irrespective of whether they actually have a battery or not.

APPLE_RDESC_BATTERY is a quirk that indicates the device has a battery
and needs the battery timer. This patch checks for this quirk before
setting up the timer, ensuring that only devices with a battery will
have the timer set up.

Fixes: 6e143293e17a ("HID: apple: Report Magic Keyboard battery over USB")
Cc: stable@vger.kernel.org
Signed-off-by: Aditya Garg <gargaditya08@live.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 0639b1f43d884e198ada39fd5b42d617dd1fb17e..8ab15a8f35247ac3a9254f46c5ac507e34aaecae 100644 (file)
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -933,10 +933,12 @@ static int apple_probe(struct hid_device *hdev,
                return ret;
        }
 
-       timer_setup(&asc->battery_timer, apple_battery_timer_tick, 0);
-       mod_timer(&asc->battery_timer,
-                 jiffies + msecs_to_jiffies(APPLE_BATTERY_TIMEOUT_MS));
-       apple_fetch_battery(hdev);
+       if (quirks & APPLE_RDESC_BATTERY) {
+               timer_setup(&asc->battery_timer, apple_battery_timer_tick, 0);
+               mod_timer(&asc->battery_timer,
+                         jiffies + msecs_to_jiffies(APPLE_BATTERY_TIMEOUT_MS));
+               apple_fetch_battery(hdev);
+       }
 
        if (quirks & APPLE_BACKLIGHT_CTL)
                apple_backlight_init(hdev);
@@ -950,7 +952,9 @@ static int apple_probe(struct hid_device *hdev,
        return 0;
 
 out_err:
-       timer_delete_sync(&asc->battery_timer);
+       if (quirks & APPLE_RDESC_BATTERY)
+               timer_delete_sync(&asc->battery_timer);
+
        hid_hw_stop(hdev);
        return ret;
 }
@@ -959,7 +963,8 @@ static void apple_remove(struct hid_device *hdev)
 {
        struct apple_sc *asc = hid_get_drvdata(hdev);
 
-       timer_delete_sync(&asc->battery_timer);
+       if (asc->quirks & APPLE_RDESC_BATTERY)
+               timer_delete_sync(&asc->battery_timer);
 
        hid_hw_stop(hdev);
 }