diff options
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 69c7df78281d..fa54d3290659 100644 --- 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); |