svn commit: r234215 - in stable/9/sys: i386/conf kern pci

[Andriy Gapon]

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

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

Modified:
  stable/9/sys/pci/intpm.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/pci/intpm.c
==============================================================================
--- stable/9/sys/pci/intpm.c	Fri Apr 13 08:04:00 2012	(r234214)
+++ stable/9/sys/pci/intpm.c	Fri Apr 13 08:08:44 2012	(r234215)
@@ -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);