From owner-svn-src-head@freebsd.org  Thu Dec 22 00:09:55 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43DEFC8B4E7;
 Thu, 22 Dec 2016 00:09:55 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 05DC71BD7;
 Thu, 22 Dec 2016 00:09:54 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBM09s45029259;
 Thu, 22 Dec 2016 00:09:54 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBM09s5M029258;
 Thu, 22 Dec 2016 00:09:54 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201612220009.uBM09s5M029258@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Thu, 22 Dec 2016 00:09:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310381 - head/sys/dev/ow
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2016 00:09:55 -0000

Author: gavin
Date: Thu Dec 22 00:09:53 2016
New Revision: 310381
URL: https://svnweb.freebsd.org/changeset/base/310381

Log:
  ow_temp: Update the temperature visible via the sysctl atomically, rather
  than using it as temporary calculation space.

Modified:
  head/sys/dev/ow/ow_temp.c

Modified: head/sys/dev/ow/ow_temp.c
==============================================================================
--- head/sys/dev/ow/ow_temp.c	Wed Dec 21 23:59:58 2016	(r310380)
+++ head/sys/dev/ow/ow_temp.c	Thu Dec 22 00:09:53 2016	(r310381)
@@ -137,7 +137,7 @@ ow_temp_event_thread(void *arg)
 	struct ow_temp_softc *sc;
 	uint8_t scratch[8 + 1];
 	uint8_t crc;
-	int retries, rv;
+	int retries, rv, tmp;
 
 	sc = arg;
 	pause("owtstart", device_get_unit(sc->dev) * hz / 100);	// 10ms stagger
@@ -166,14 +166,14 @@ ow_temp_event_thread(void *arg)
 							 * Formula from DS18S20 datasheet, page 6
 							 * DS18S20 datasheet says count_per_c is 16, DS1820 does not
 							 */
-							sc->temp = (int16_t)((scratch[0] & 0xfe) |
+							tmp = (int16_t)((scratch[0] & 0xfe) |
 							    (scratch[1] << 8)) << 3;
-							sc->temp += 16 - scratch[6] - 4; /* count_per_c == 16 */
+							tmp += 16 - scratch[6] - 4; /* count_per_c == 16 */
 						} else
-							sc->temp = (int16_t)(scratch[0] | (scratch[1] << 8)) << 3;
+							tmp = (int16_t)(scratch[0] | (scratch[1] << 8)) << 3;
 					} else
-						sc->temp = (int16_t)(scratch[0] | (scratch[1] << 8));
-					sc->temp = sc->temp * 1000 / 16 + 273150;
+						tmp = (int16_t)(scratch[0] | (scratch[1] << 8));
+					sc->temp = tmp * 1000 / 16 + 273150;
 					break;
 				}
 				sc->bad_crc++;