From owner-svn-src-stable-8@FreeBSD.ORG  Fri Apr 13 08:11:15 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 24F421065670;
	Fri, 13 Apr 2012 08:11:15 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F5718FC15;
	Fri, 13 Apr 2012 08:11:15 +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 q3D8BE2Q067694;
	Fri, 13 Apr 2012 08:11:14 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3D8BEFh067692;
	Fri, 13 Apr 2012 08:11:14 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204130811.q3D8BEFh067692@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 13 Apr 2012 08:11:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234216 - in stable/8/sys: i386/conf pci
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 08:11:15 -0000

Author: avg
Date: Fri Apr 13 08:11:14 2012
New Revision: 234216
URL: http://svn.freebsd.org/changeset/base/234216

Log:
  MFC r234043: intpm: return only SMB bus error codes from SMB methods

Modified:
  stable/8/sys/pci/intpm.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)
  stable/8/sys/i386/conf/XENHVM   (props changed)

Modified: stable/8/sys/pci/intpm.c
==============================================================================
--- stable/8/sys/pci/intpm.c	Fri Apr 13 08:08:44 2012	(r234215)
+++ stable/8/sys/pci/intpm.c	Fri Apr 13 08:11:14 2012	(r234216)
@@ -272,7 +272,7 @@ intsmb_callback(device_t dev, int index,
 	case SMB_RELEASE_BUS:
 		break;
 	default:
-		error = EINVAL;
+		error = SMB_EINVAL;
 	}
 
 	return (error);
@@ -519,7 +519,7 @@ intsmb_quick(device_t dev, u_char slave,
 		data |= LSB;
 		break;
 	default:
-		return (EINVAL);
+		return (SMB_EINVAL);
 	}
 
 	INTSMB_LOCK(sc);
@@ -774,7 +774,7 @@ intsmb_bread(device_t dev, u_char slave,
 			}
 			*count = nread;
 		} else
-			error = EIO;
+			error = SMB_EBUSERR;
 	}
 	INTSMB_UNLOCK(sc);
 	return (error);