lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 143/165] HID: apple: fix battery support for the 2009 ANSI wireless keyboard
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ross Skaliotis <rskaliotis@gmail.com>

    commit cbd366bea2b8513bc0fc1c9e8832cb0ab221d6d5 upstream.

    Enabled quirks necessary for correct battery capacity reporting. Cleaned up
    surrounding style.

    Signed-off-by: Ross Skaliotis <rskaliotis@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/hid/hid-input.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
    index 79fa1cd9dfdd..197128ed8225 100644
    --- a/drivers/hid/hid-input.c
    +++ b/drivers/hid/hid-input.c
    @@ -306,10 +306,13 @@ static enum power_supply_property hidinput_battery_props[] = {

    static const struct hid_device_id hid_battery_quirks[] = {
    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
    - USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
    - HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
    + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
    + HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
    + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
    + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
    + HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
    - USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
    + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
    HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
    { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
    USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),

    \
     
     \ /
      Last update: 2015-03-25 15:41    [W:4.054 / U:0.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site