From owner-svn-src-all@FreeBSD.ORG  Sat Mar  3 02:16:45 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B4E90106566B;
	Sat,  3 Mar 2012 02:16:45 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A307D8FC14;
	Sat,  3 Mar 2012 02:16:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q232GjYO058345;
	Sat, 3 Mar 2012 02:16:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q232GjC7058343;
	Sat, 3 Mar 2012 02:16:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201203030216.q232GjC7058343@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 3 Mar 2012 02:16:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232430 - stable/9/sys/powerpc/powermac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 02:16:45 -0000

Author: nwhitehorn
Date: Sat Mar  3 02:16:45 2012
New Revision: 232430
URL: http://svn.freebsd.org/changeset/base/232430

Log:
  MFC r231770:
  Improve error handling in smusat(4).

Modified:
  stable/9/sys/powerpc/powermac/smusat.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/powermac/smusat.c
==============================================================================
--- stable/9/sys/powerpc/powermac/smusat.c	Sat Mar  3 02:15:52 2012	(r232429)
+++ stable/9/sys/powerpc/powermac/smusat.c	Sat Mar  3 02:16:45 2012	(r232430)
@@ -202,33 +202,46 @@ static int
 smusat_updatecache(device_t dev)
 {
 	uint8_t reg = 0x3f;
+	uint8_t	value[16];
 	struct smusat_softc *sc = device_get_softc(dev);
+	int error;
 	struct iic_msg msgs[2] = {
 	    {0, IIC_M_WR | IIC_M_NOSTOP, 1, &reg},
-	    {0, IIC_M_RD, 16, sc->sc_cache},
+	    {0, IIC_M_RD, 16, value},
 	};
 
 	msgs[0].slave = msgs[1].slave = iicbus_get_addr(dev);
-	sc->sc_last_update = time_uptime;
+	error = iicbus_transfer(dev, msgs, 2);
+	if (error)
+		return (error);
 
-	return (iicbus_transfer(dev, msgs, 2));
+	sc->sc_last_update = time_uptime;
+	memcpy(sc->sc_cache, value, sizeof(value));
+	return (0);
 }
 
 static int
 smusat_sensor_read(struct smu_sensor *sens)
 {
-	int value;
+	int value, error;
 	device_t dev;
 	struct smusat_softc *sc;
 
 	dev = sens->dev;
 	sc = device_get_softc(dev);
+	error = 0;
 
 	if (time_uptime - sc->sc_last_update > 1)
-		smusat_updatecache(dev);
+		error = smusat_updatecache(dev);
+	if (error)
+		return (-error);
 
 	value = (sc->sc_cache[sens->reg*2] << 8) +
 	    sc->sc_cache[sens->reg*2 + 1];
+	if (value == 0xffff) {
+		sc->sc_last_update = 0; /* Result was bad, don't cache */
+		return (-EINVAL);
+	}
 
 	switch (sens->type) {
 	case SMU_TEMP_SENSOR: