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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 47219C2D0DB for ; Tue, 28 Jan 2020 14:07:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EE2524685 for ; Tue, 28 Jan 2020 14:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220444; bh=9kR/3OCN6jMu5Onj2cKpowi5ii9LW+C2hiYmA5NJb28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WAFCO/zdFfjjBfv/NlONvVRFXG+bl7n8ozx/mcpLJym+FiuGoBBKP/aVvz7dGRC5T jF7WpC2gMyowG9K0pv6kVTbqr5GrBh10L8IOzLK83c5TYTmvi0ClAimoKrVKBu+xQe TAEQVilJmKUgORwBxZidoD21wLCkIIOmGQwFIQTY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727913AbgA1ODl (ORCPT ); Tue, 28 Jan 2020 09:03:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:50498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727909AbgA1ODk (ORCPT ); Tue, 28 Jan 2020 09:03:40 -0500 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 4CDE52468E; Tue, 28 Jan 2020 14:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220219; bh=9kR/3OCN6jMu5Onj2cKpowi5ii9LW+C2hiYmA5NJb28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GGVi9awgukjkXRZPcGXQ38k+cxMm8wb/b0lDWX3yO7HmTe3DuhEc1C+1ddUewpw+m XGYWY5lDk79/7RsOoW7bCRIruss5CkQ22U+m77RTP8n+sUTvB+xfs0UbyEksB287uB //XgVrc5zKcnDJ/BEprzSYxb8vRwLbBnQhtx6hgc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephan Gerhold , Dmitry Torokhov Subject: [PATCH 5.4 064/104] Input: pm8xxx-vib - fix handling of separate enable register Date: Tue, 28 Jan 2020 15:00:25 +0100 Message-Id: <20200128135826.358779254@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135817.238524998@linuxfoundation.org> References: <20200128135817.238524998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephan Gerhold commit 996d5d5f89a558a3608a46e73ccd1b99f1b1d058 upstream. Setting the vibrator enable_mask is not implemented correctly: For regmap_update_bits(map, reg, mask, val) we give in either regs->enable_mask or 0 (= no-op) as mask and "val" as value. But "val" actually refers to the vibrator voltage control register, which has nothing to do with the enable_mask. So we usually end up doing nothing when we really wanted to enable the vibrator. We want to set or clear the enable_mask (to enable/disable the vibrator). Therefore, change the call to always modify the enable_mask and set the bits only if we want to enable the vibrator. Fixes: d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register") Signed-off-by: Stephan Gerhold Link: https://lore.kernel.org/r/20200114183442.45720-1-stephan@gerhold.net Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/misc/pm8xxx-vibrator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -90,7 +90,7 @@ static int pm8xxx_vib_set(struct pm8xxx_ if (regs->enable_mask) rc = regmap_update_bits(vib->regmap, regs->enable_addr, - on ? regs->enable_mask : 0, val); + regs->enable_mask, on ? ~0 : 0); return rc; }