diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
commit | 60e677bfffd835ef56d8a2f25f9a2f8eaa8f2b7c (patch) | |
tree | f08c3de386ee6289abbb1a7180c06f6c7c67a2c7 /drivers/input | |
parent | fbd46dc5333e0bc45719a7ed38d3411aef7dcd61 (diff) | |
parent | 60584ef99395a89d136399bbc127289a4aa29dc7 (diff) |
Merge commit 'v2.6.38.5' into linaro-2.6.38
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/xen-kbdfront.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index 53e62732ee9..c35ab940f1f 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c @@ -286,7 +286,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, enum xenbus_state backend_state) { struct xenkbd_info *info = dev_get_drvdata(&dev->dev); - int val; + int ret, val; switch (backend_state) { case XenbusStateInitialising: @@ -299,6 +299,16 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, case XenbusStateInitWait: InitWait: + ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "feature-abs-pointer", "%d", &val); + if (ret < 0) + val = 0; + if (val) { + ret = xenbus_printf(XBT_NIL, info->xbdev->nodename, + "request-abs-pointer", "1"); + if (ret) + pr_warning("can't request abs-pointer\n"); + } xenbus_switch_state(dev, XenbusStateConnected); break; |