From owner-svn-src-all@FreeBSD.ORG  Sun Apr  8 20:48:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BA922106566B;
	Sun,  8 Apr 2012 20:48:39 +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 A5F378FC0C;
	Sun,  8 Apr 2012 20:48:39 +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 q38KmdnA027713;
	Sun, 8 Apr 2012 20:48:39 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38Kmdnr027711;
	Sun, 8 Apr 2012 20:48:39 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204082048.q38Kmdnr027711@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 8 Apr 2012 20:48:39 +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: r234043 - head/sys/pci
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: Sun, 08 Apr 2012 20:48:39 -0000

Author: avg
Date: Sun Apr  8 20:48:39 2012
New Revision: 234043
URL: http://svn.freebsd.org/changeset/base/234043

Log:
  intpm: return only SMB bus error codes from SMB methods
  
  PR:		kern/25733
  MFC after:	5 days

Modified:
  head/sys/pci/intpm.c

Modified: head/sys/pci/intpm.c
==============================================================================
--- head/sys/pci/intpm.c	Sun Apr  8 20:44:57 2012	(r234042)
+++ head/sys/pci/intpm.c	Sun Apr  8 20:48:39 2012	(r234043)
@@ -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);