From owner-svn-src-head@FreeBSD.ORG  Fri Jan  1 22:47:53 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A19151065694;
	Fri,  1 Jan 2010 22:47:53 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 77B988FC19;
	Fri,  1 Jan 2010 22:47:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o01Mlr14048984;
	Fri, 1 Jan 2010 22:47:53 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o01Mlr8P048981;
	Fri, 1 Jan 2010 22:47:53 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201001012247.o01Mlr8P048981@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 1 Jan 2010 22:47:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201371 - in head/sys: dev/mk48txx sparc64/sparc64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jan 2010 22:47:53 -0000

Author: marius
Date: Fri Jan  1 22:47:53 2010
New Revision: 201371
URL: http://svn.freebsd.org/changeset/base/201371

Log:
  Fix botches in r201005:
  - Actually use the newly introduced sc_res in the front-end.
  - Remove a whitespace glitch in mk48txx_gettime().

Modified:
  head/sys/dev/mk48txx/mk48txx.c
  head/sys/sparc64/sparc64/eeprom.c

Modified: head/sys/dev/mk48txx/mk48txx.c
==============================================================================
--- head/sys/dev/mk48txx/mk48txx.c	Fri Jan  1 22:10:07 2010	(r201370)
+++ head/sys/dev/mk48txx/mk48txx.c	Fri Jan  1 22:47:53 2010	(r201371)
@@ -184,7 +184,7 @@ mk48txx_gettime(device_t dev, struct tim
 	 * Set dow = -1 because some drivers (for example the NetBSD and
 	 * OpenBSD mk48txx(4)) don't set it correctly.
 	 */
-	ct.dow = - 1;
+	ct.dow = -1;
 #endif
 	ct.mon = FROMBCD(FROMREG(MK48TXX_IMON, MK48TXX_MON_MASK));
 	year = FROMBCD(FROMREG(MK48TXX_IYEAR, MK48TXX_YEAR_MASK));

Modified: head/sys/sparc64/sparc64/eeprom.c
==============================================================================
--- head/sys/sparc64/sparc64/eeprom.c	Fri Jan  1 22:10:07 2010	(r201370)
+++ head/sys/sparc64/sparc64/eeprom.c	Fri Jan  1 22:47:53 2010	(r201371)
@@ -119,7 +119,6 @@ static int
 eeprom_attach(device_t dev)
 {
 	struct mk48txx_softc *sc;
-	struct resource *res;
 	struct timespec ts;
 	int error, rid;
 
@@ -128,8 +127,9 @@ eeprom_attach(device_t dev)
 	mtx_init(&sc->sc_mtx, "eeprom_mtx", NULL, MTX_DEF);
 
 	rid = 0;
-	res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
-	if (res == NULL) {
+	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->sc_res == NULL) {
 		device_printf(dev, "cannot allocate resources\n");
 		error = ENXIO;
 		goto fail_mtx;
@@ -178,7 +178,7 @@ eeprom_attach(device_t dev)
 	return (0);
 
  fail_res:
-	bus_release_resource(dev, SYS_RES_MEMORY, rid, res);
+	bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->sc_res);
  fail_mtx:
 	mtx_destroy(&sc->sc_mtx);