Merge remote-tracking branch 'battery/master'

[karo-tx-linux.git] / drivers / hid / wacom_wac.c

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 69c7df78281d1c918ca4a2f4750d480403cc68d7..fa54d329065945bade5b9048df9cb5a98c0bf7f2 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -61,8 +61,8 @@ static void wacom_notify_battery(struct wacom_wac *wacom_wac,
                wacom_wac->bat_connected = bat_connected;
                wacom_wac->ps_connected = ps_connected;
 
-               if (wacom->battery.dev)
-                       power_supply_changed(&wacom->battery);
+               if (wacom->battery)
+                       power_supply_changed(wacom->battery);
        }
 }
 
@@ -1991,7 +1991,7 @@ static int wacom_status_irq(struct wacom_wac *wacom_wac, size_t len)
                wacom_notify_battery(wacom_wac, battery, charging,
                                     battery || charging, 1);
 
-               if (!wacom->battery.dev &&
+               if (!wacom->battery &&
                    !(features->quirks & WACOM_QUIRK_BATTERY)) {
                        features->quirks |= WACOM_QUIRK_BATTERY;
                        INIT_WORK(&wacom->work, wacom_battery_work);
@@ -1999,7 +1999,7 @@ static int wacom_status_irq(struct wacom_wac *wacom_wac, size_t len)
                }
        }
        else if ((features->quirks & WACOM_QUIRK_BATTERY) &&
-                wacom->battery.dev) {
+                wacom->battery) {
                features->quirks &= ~WACOM_QUIRK_BATTERY;
                INIT_WORK(&wacom->work, wacom_battery_work);
                wacom_schedule_work(wacom_wac);