Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp929898ybt; Wed, 17 Jun 2020 18:11:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIgPat43o3gdvOe+D8TzWfA8sPOJOn5o1+eb7IYUXVBh7dbPz/9CgW08NZuIWD61ZkCUaA X-Received: by 2002:a05:6402:a42:: with SMTP id bt2mr1781592edb.42.1592442694492; Wed, 17 Jun 2020 18:11:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442694; cv=none; d=google.com; s=arc-20160816; b=VmYOee66Nj9Xf49qLmDhly0Ba+A/xfn7XiwoW3xDl6CGjbMw4ULUeP8SQ/2w8ZQtyl rORRMu/cRKWTFkc90GW0YqIjhWn5szNFsDcDoV0Ey4lPeOHbYHLRC5RmE1HV60Y1lKuG 63x+Jj3I08cY09HYMOuEyuuUICreNJwc5QYYfAIg07rB7Oob0KXLsJiXIhTtDDBXk9A0 JkOGN+tsArKZEPCyhi7vyFMW4NLHID+LrK9TdX0NvFzrlnT7tTHkB+ZhikGOwv8xlXVb g/RSCAldYDR0s6wJPwN4ikjNtvUvPXH6LwLsUNVXiaVo9JjtG5MBngyuD54MN572DDRR tHZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4cJcYLPyybJR74i2cd2FJtWiaVc0O/+Tala8iyMX7S8=; b=vL5sci3H27uqTZOCEu6IldpufpfWIHnyCu7WfFBHtBHmMdaJdZRD74UBTkdGZFvns9 SKuk5l/JPRTw78amJNBg1Lz3K4iqpFX1wePUaLJoEC6N7topRqBpxyh5Sa99h8hssyhR b6YeAPnyuYUGnYLKgD2+Pk0sYFNywroDlRlWA25e6USr5bo14Jg5DsitvNA94yIHT1cS KIxE+HKxMpiWbbjqKAHF6EUxg7byAxjz1yGEvRxByjgbWhtnq6WdGHYLq4mLkKvysC+V Rf23xGBQrrJsd/O1Q0oZ88xkHBK1132P1itiQYHjVHSGqhma3MJ3pf4UEmcEl7T26/VX T31w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FwjVUpuh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h9si1066631edf.128.2020.06.17.18.11.11; Wed, 17 Jun 2020 18:11:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FwjVUpuh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727971AbgFRBIz (ORCPT + 99 others); Wed, 17 Jun 2020 21:08:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727898AbgFRBIq (ORCPT ); Wed, 17 Jun 2020 21:08:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9114921D6C; Thu, 18 Jun 2020 01:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442526; bh=RN2bILSQm9t4nnyHUz9ZGhGu6QRwP2bTK5/z6XWX6JY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FwjVUpuhW1Ls1i5Mf99YeXEAWn/rm5HDPsrIaN2LfUt0gcn6N+Ux4wwFAF9DsnJF2 HkesmzMPJJEUvrUFytb75Kdav8fEJLYcwpKoThKmMMQP04in2Q/zQda9HQtSeNMMKM WfKdZmIBZmYmJ47C2psABr4V62/qfx82uqeoXV6Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marco Felsch , Dmitry Torokhov , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 030/388] Input: edt-ft5x06 - fix get_default register write access Date: Wed, 17 Jun 2020 21:02:07 -0400 Message-Id: <20200618010805.600873-30-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marco Felsch [ Upstream commit 255cdaf73412de13608fb776101402dca68bed2b ] Since commit b6eba86030bf ("Input: edt-ft5x06 - add offset support for ev-ft5726") offset-x and offset-y is supported. Devices using those offset parameters don't support the offset parameter so we need to add the NO_REGISTER check for edt_ft5x06_ts_get_defaults(). Fixes: b6eba86030bf ("Input: edt-ft5x06 - add offset support for ev-ft5726") Signed-off-by: Marco Felsch Link: https://lore.kernel.org/r/20200227112819.16754-2-m.felsch@pengutronix.de Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/touchscreen/edt-ft5x06.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index d2587724c52a..9b8450794a8a 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -938,19 +938,25 @@ static void edt_ft5x06_ts_get_defaults(struct device *dev, error = device_property_read_u32(dev, "offset", &val); if (!error) { - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, val); + if (reg_addr->reg_offset != NO_REGISTER) + edt_ft5x06_register_write(tsdata, + reg_addr->reg_offset, val); tsdata->offset = val; } error = device_property_read_u32(dev, "offset-x", &val); if (!error) { - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_x, val); + if (reg_addr->reg_offset_x != NO_REGISTER) + edt_ft5x06_register_write(tsdata, + reg_addr->reg_offset_x, val); tsdata->offset_x = val; } error = device_property_read_u32(dev, "offset-y", &val); if (!error) { - edt_ft5x06_register_write(tsdata, reg_addr->reg_offset_y, val); + if (reg_addr->reg_offset_y != NO_REGISTER) + edt_ft5x06_register_write(tsdata, + reg_addr->reg_offset_y, val); tsdata->offset_y = val; } } -- 2.25.1