From owner-svn-src-head@FreeBSD.ORG  Thu Sep  9 18:35:08 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 CCEC910656B7;
	Thu,  9 Sep 2010 18:35:08 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BD5BC8FC08;
	Thu,  9 Sep 2010 18:35:08 +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 o89IZ8qb017421;
	Thu, 9 Sep 2010 18:35:08 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o89IZ8bP017419;
	Thu, 9 Sep 2010 18:35:08 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201009091835.o89IZ8bP017419@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Thu, 9 Sep 2010 18:35:08 +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: r212371 - head/sys/dev/led
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: Thu, 09 Sep 2010 18:35:08 -0000

Author: mdf
Date: Thu Sep  9 18:35:08 2010
New Revision: 212371
URL: http://svn.freebsd.org/changeset/base/212371

Log:
  Fix an incorrect use of sbuf_overflowed() after a call to sbuf_finish().

Modified:
  head/sys/dev/led/led.c

Modified: head/sys/dev/led/led.c
==============================================================================
--- head/sys/dev/led/led.c	Thu Sep  9 18:33:46 2010	(r212370)
+++ head/sys/dev/led/led.c	Thu Sep  9 18:35:08 2010	(r212371)
@@ -220,15 +220,11 @@ led_write(struct cdev *dev, struct uio *
 			free(s2, M_DEVBUF);
 			return (EINVAL);
 	}
-	sbuf_finish(sb);
+	error = sbuf_finish(sb);
 	free(s2, M_DEVBUF);
-	if (sbuf_overflowed(sb)) {
+	if (error != 0 || sbuf_len(sb) == 0) {
 		sbuf_delete(sb);
-		return (ENOMEM);
-	}
-	if (sbuf_len(sb) == 0) {
-		sbuf_delete(sb);
-		return (0);
+		return (error);
 	}
 
 	return (led_state(dev, sb, 0));