[Xen-devel] [PATCH 2/2] xen, input: repair xen-kbdfront resolution setting via xenstore

[Juergen Gross <jgross@xxxxxxxx>]

Setting the pointing device resolution via Xenstore isn't working
reliably: in case XenbusStateInitWait has been missed the resolution
settings won't be read. Correct this.

Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 drivers/input/misc/xen-kbdfront.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/drivers/input/misc/xen-kbdfront.c 
b/drivers/input/misc/xen-kbdfront.c
index 2df5678..7585fa4 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -312,11 +312,27 @@ static void xenkbd_disconnect_backend(struct xenkbd_info 
*info)
        info->gref = -1;
 }
 
+static void xenkbd_set_connected(struct xenbus_device *dev)
+{
+       struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
+       int ret;
+
+       if (xenbus_read_unsigned(info->xbdev->otherend,
+                                "feature-abs-pointer", 0)) {
+               ret = xenbus_write(XBT_NIL, info->xbdev->nodename,
+                                  "request-abs-pointer", "1");
+               if (ret)
+                       pr_warn("xenkbd: can't request abs-pointer");
+       }
+
+       xenbus_switch_state(dev, XenbusStateConnected);
+}
+
 static void xenkbd_backend_changed(struct xenbus_device *dev,
                                   enum xenbus_state backend_state)
 {
        struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
-       int ret, val;
+       int val;
 
        switch (backend_state) {
        case XenbusStateInitialising:
@@ -327,16 +343,7 @@ static void xenkbd_backend_changed(struct xenbus_device 
*dev,
                break;
 
        case XenbusStateInitWait:
-InitWait:
-               if (xenbus_read_unsigned(info->xbdev->otherend,
-                                        "feature-abs-pointer", 0)) {
-                       ret = xenbus_write(XBT_NIL, info->xbdev->nodename,
-                                          "request-abs-pointer", "1");
-                       if (ret)
-                               pr_warning("xenkbd: can't request abs-pointer");
-               }
-
-               xenbus_switch_state(dev, XenbusStateConnected);
+               xenkbd_set_connected(dev);
                break;
 
        case XenbusStateConnected:
@@ -346,7 +353,8 @@ static void xenkbd_backend_changed(struct xenbus_device 
*dev,
                 * get Connected twice here.
                 */
                if (dev->state != XenbusStateConnected)
-                       goto InitWait; /* no InitWait seen yet, fudge it */
+                       /* No InitWait seen yet, fudge it. */
+                       xenkbd_set_connected(dev);
 
                /* Set input abs params to match backend screen res */
                if (xenbus_scanf(XBT_NIL, info->xbdev->otherend,
-- 
2.10.2


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel