Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp4914535imc; Mon, 25 Feb 2019 13:32:05 -0800 (PST) X-Google-Smtp-Source: AHgI3IZIj1AASCafLbZ3A9mVBcRp5mLqJExx7lMJV+SI5A3XymD3Ls/sm4vMn5cpdkLd0MF+QOmz X-Received: by 2002:a17:902:8643:: with SMTP id y3mr22090177plt.195.1551130325546; Mon, 25 Feb 2019 13:32:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551130325; cv=none; d=google.com; s=arc-20160816; b=EbBPgbiF38pGgF9S7QU0VlAMP0bEYkkKprSB/YpGDE2gjjCEHuG/cfVJbeOPrxzKjq XkkanKv6c1FYdi4EvNl05bXwOSy2KWFxqZnXnW9Sby9b9CyZIrtKYGcn3ZkSFKyfAP0K Pv+Z4vleJxi7yF/x5u8peZBKAkKI11QkS7a2Ahgq4iNJkkDfPLZzrRgXvtJ0N53U90/h cRPx8Vr7tv5zR0soxkQUvl171wgqNhOu3CX26deN0lFlK+zSSLbk0GIxw/SgIo5L2SVN UjqAX99BxHBp7MkU/t4fg82tSBj9tjHxHp+Qyp2qLTBun4lETX3QDpQXv3yUxC7JXMwE 8Vcg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5g85wsG9bEl7kwBtGkAswHJmsniMZLOTmasDCf9Oz/4=; b=h1of77NAGu9d3W9WJAXAJs57NOaadoYmXQpAo5Z+Yup+hBOepLiOndMF8Vqy+N1tw6 SVVj+7GrB9EqbY5S/shbwIEEGJsb94qGDq/PJnZbKI2fZ/mXbVSkjC3Sh8ZwU2C6tVuQ wWeItgqTrFvdGA9k8mRJv8KWffLbKcoBpT1S8chLhK5xAPDLnsLpC2bMXsqFeIZ+mY06 cCsjwt3HlTDgVq7MyeXQvQQRQNl0cc6lqpywZhz35U4saOSlN0ZexHcilgT0eRtDg1xh /RAhLWCkkguG/P8ymWLXO2V8ExCih+KqYwjHyo+siexqLxjkaUg2byqvSEg/801ebXaV MlVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BJt5EtEK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gn15si10488898plb.36.2019.02.25.13.31.50; Mon, 25 Feb 2019 13:32:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BJt5EtEK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731896AbfBYVaQ (ORCPT + 99 others); Mon, 25 Feb 2019 16:30:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:35878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732094AbfBYVaI (ORCPT ); Mon, 25 Feb 2019 16:30:08 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 7B07D217F5; Mon, 25 Feb 2019 21:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130208; bh=Jrf+LgU6njWbIc8kAxMPw7YF03BpvVlUAee+zqWusxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BJt5EtEKsQ9V4NXsiQWzDEifonEVPhR2wK/9BgT190RZtQq87pVTgNlNFBPYfgbQq gLcBGdHO5oUZp8oAfgNUJbJQvcqxcwds1bFRKpd9HLIN3e8XQiRexRgEqcEG+s19V2 Qc+Ttu5q9YegjsZmpYvTUxiAuUCjGkepZnEjXAc4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Cook , Guenter Roeck , Sasha Levin Subject: [PATCH 4.20 047/183] hwmon: (nct6775) Fix chip ID for NCT6798D Date: Mon, 25 Feb 2019 22:10:20 +0100 Message-Id: <20190225195102.503570173@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 264142bc70ec039e26d8f3b46a717e8037f59ca0 ] The chip ID is 0xd42[8-f], not 0xd45[8-f]. Fixes: 0599682b826f ("hwmon: (nct6775) Add support for NCT6798D") Reported-by: Michael Cook Cc: Michael Cook Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/nct6775.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index c3040079b1cb6..8f91e366866f3 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -44,8 +44,8 @@ * nct6796d 14 7 7 2+6 0xd420 0xc1 0x5ca3 * nct6797d 14 7 7 2+6 0xd450 0xc1 0x5ca3 * (0xd451) - * nct6798d 14 7 7 2+6 0xd458 0xc1 0x5ca3 - * (0xd459) + * nct6798d 14 7 7 2+6 0xd428 0xc1 0x5ca3 + * (0xd429) * * #temp lists the number of monitored temperature sources (first value) plus * the number of directly connectable temperature sensors (second value). @@ -138,7 +138,7 @@ MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal"); #define SIO_NCT6795_ID 0xd350 #define SIO_NCT6796_ID 0xd420 #define SIO_NCT6797_ID 0xd450 -#define SIO_NCT6798_ID 0xd458 +#define SIO_NCT6798_ID 0xd428 #define SIO_ID_MASK 0xFFF8 enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 }; -- 2.19.1