From patchwork Tue Mar 21 17:19:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9637191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1606D602CC for ; Tue, 21 Mar 2017 17:20:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03AA328418 for ; Tue, 21 Mar 2017 17:20:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECC5E28449; Tue, 21 Mar 2017 17:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83BC428418 for ; Tue, 21 Mar 2017 17:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933735AbdCURT4 (ORCPT ); Tue, 21 Mar 2017 13:19:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:47889 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933656AbdCURTL (ORCPT ); Tue, 21 Mar 2017 13:19:11 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id CEEDAAC2E; Tue, 21 Mar 2017 17:19:08 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Juergen Gross , stable@vger.kernel.org Subject: [PATCH 2/2] xen, input: repair xen-kbdfront resolution setting via xenstore Date: Tue, 21 Mar 2017 18:19:05 +0100 Message-Id: <20170321171905.31584-3-jgross@suse.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170321171905.31584-1-jgross@suse.com> References: <20170321171905.31584-1-jgross@suse.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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@vger.kernel.org Signed-off-by: Juergen Gross Reviewed-by: Oleksandr Andrushchenko --- 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,