HID: wacom: EKR: attach the power_supply on first connection

Or Gnome complains about an empty battery.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 04f5c753c868ab494df2afc4171bae66698c94f9..1d79215a7968652203d8b8ccb90cbca28a263a71 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1917,6 +1917,10 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
        remote->remotes[index].registered = false;
        spin_unlock_irqrestore(&remote->remote_lock, flags);
 
+       if (remote->remotes[index].battery.battery)
+               devres_release_group(&wacom->hdev->dev,
+                                    &remote->remotes[index].battery.bat_desc);
+
        if (remote->remotes[index].group.name)
                devres_release_group(&wacom->hdev->dev,
                                     &remote->remotes[index]);
@@ -1926,6 +1930,7 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
                        remote->remotes[i].serial = 0;
                        remote->remotes[i].group.name = NULL;
                        remote->remotes[i].registered = false;
+                       remote->remotes[i].battery.battery = NULL;
                        wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN;
                }
        }
@@ -1982,11 +1987,6 @@ static int wacom_remote_create_one(struct wacom *wacom, u32 serial,
        if (error)
                goto fail;
 
-       error = __wacom_initialize_battery(wacom,
-                                          &remote->remotes[index].battery);
-       if (error)
-               goto fail;
-
        remote->remotes[index].registered = true;
 
        devres_close_group(dev, &remote->remotes[index]);
@@ -1998,6 +1998,28 @@ static int wacom_remote_create_one(struct wacom *wacom, u32 serial,
        return error;
 }
 
+static int wacom_remote_attach_battery(struct wacom *wacom, int index)
+{
+       struct wacom_remote *remote = wacom->remote;
+       int error;
+
+       if (!remote->remotes[index].registered)
+               return 0;
+
+       if (remote->remotes[index].battery.battery)
+               return 0;
+
+       if (wacom->led.groups[index].select == WACOM_STATUS_UNKNOWN)
+               return 0;
+
+       error = __wacom_initialize_battery(wacom,
+                                       &wacom->remote->remotes[index].battery);
+       if (error)
+               return error;
+
+       return 0;
+}
+
 static void wacom_remote_work(struct work_struct *work)
 {
        struct wacom *wacom = container_of(work, struct wacom, remote_work);
@@ -2028,8 +2050,10 @@ static void wacom_remote_work(struct work_struct *work)
                serial = data.remote[i].serial;
                if (data.remote[i].connected) {
 
-                       if (remote->remotes[i].serial == serial)
+                       if (remote->remotes[i].serial == serial) {
+                               wacom_remote_attach_battery(wacom, i);
                                continue;
+                       }
 
                        if (remote->remotes[i].serial)
                                wacom_remote_destroy_one(wacom, i);