From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06C4DC43219 for ; Tue, 30 Apr 2019 12:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C37FB2075E for ; Tue, 30 Apr 2019 12:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556626136; bh=PEIgw3Yh8ZrVsMbK1As2iNlmAjYgmsm6n/R4kCwIOaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1a85+jAWLWuAmCA6VOSwQLBEnbRYgGwR2tIyuF1x26jQuQ22Us432xSPztsI107xq vzK5oV8kt/k2kskQb7OhOekL8zd8J99rnMNjoSF3aBi3pGwmmkVfy/8vOqhx9udh6O pQy8xdOnscebDOdAVxhcCJFfBj/OoH+DBmClWgDs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727580AbfD3MI4 (ORCPT ); Tue, 30 Apr 2019 08:08:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727900AbfD3Ljh (ORCPT ); Tue, 30 Apr 2019 07:39:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71A2721670; Tue, 30 Apr 2019 11:39:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624376; bh=PEIgw3Yh8ZrVsMbK1As2iNlmAjYgmsm6n/R4kCwIOaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBK7yn+vVEXbb1xL1TRVCe0CClfLZzH0b+2ArYVDXRApOO0pzkiY7nWIqJ2qk4NDb EgnRgYFbaxiOWZTWlQc2qHORzddoR4Cfbx+KWZBS9fg1wPp/Wu5bqg2LrltmrTDnT1 eOU7g1x/AyOwfGozT3hBQiM5Czi+3COw0UYeV4Sg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Philipp Zabel , Dmitry Torokhov Subject: [PATCH 4.9 12/41] Input: synaptics-rmi4 - write config register values to the right offset Date: Tue, 30 Apr 2019 13:38:23 +0200 Message-Id: <20190430113527.894541355@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113524.451237916@linuxfoundation.org> References: <20190430113524.451237916@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lucas Stach commit 3a349763cf11e63534b8f2d302f2d0c790566497 upstream. Currently any changed config register values don't take effect, as the function to write them back is called with the wrong register offset. Fixes: ff8f83708b3e (Input: synaptics-rmi4 - add support for 2D sensors and F11) Signed-off-by: Lucas Stach Reviewed-by: Philipp Zabel Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/rmi4/rmi_f11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/rmi4/rmi_f11.c +++ b/drivers/input/rmi4/rmi_f11.c @@ -1198,7 +1198,7 @@ static int rmi_f11_initialize(struct rmi ctrl->ctrl0_11[11] = ctrl->ctrl0_11[11] & ~BIT(0); rc = f11_write_control_regs(fn, &f11->sens_query, - &f11->dev_controls, fn->fd.query_base_addr); + &f11->dev_controls, fn->fd.control_base_addr); if (rc) dev_warn(&fn->dev, "Failed to write control registers\n");