From owner-svn-src-all@freebsd.org  Mon Jul 31 16:46:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 28A0FDB4013;
 Mon, 31 Jul 2017 16:46:18 +0000 (UTC) (envelope-from ian@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 E6D2B83AF0;
 Mon, 31 Jul 2017 16:46:17 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6VGkH5O032509;
 Mon, 31 Jul 2017 16:46:17 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6VGkHif032508;
 Mon, 31 Jul 2017 16:46:17 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201707311646.v6VGkHif032508@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 31 Jul 2017 16:46:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321798 - head/sys/dev/iicbus
X-SVN-Group: head
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: head/sys/dev/iicbus
X-SVN-Commit-Revision: 321798
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jul 2017 16:46:18 -0000

Author: ian
Date: Mon Jul 31 16:46:16 2017
New Revision: 321798
URL: https://svnweb.freebsd.org/changeset/base/321798

Log:
  Restore a few rather important lines of code that got fumbled in r321746.

Modified:
  head/sys/dev/iicbus/ds1307.c

Modified: head/sys/dev/iicbus/ds1307.c
==============================================================================
--- head/sys/dev/iicbus/ds1307.c	Mon Jul 31 15:50:58 2017	(r321797)
+++ head/sys/dev/iicbus/ds1307.c	Mon Jul 31 16:46:16 2017	(r321798)
@@ -380,6 +380,10 @@ ds1307_settime(device_t dev, struct timespec *ts)
 	} else
 		pmflags = 0;
 
+	getnanotime(ts);
+	ts->tv_sec -= utc_offset();
+	clock_ts_to_ct(ts, &ct);
+
 	data[DS1307_SECS]    = TOBCD(ct.sec);
 	data[DS1307_MINS]    = TOBCD(ct.min);
 	data[DS1307_HOUR]    = TOBCD(ct.hour) | pmflags;