2 files changed, 8 insertions, 4 deletions

diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 331e6b91e1934..7bf1af68ea3af 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -171,7 +171,7 @@ smbwrite(dev_t dev, struct uio * uio, int ioflag)
 {
 	/* not supported */
 
-	return (ENODEV);
+	return (EINVAL);
 }
 
 static int
@@ -179,7 +179,7 @@ smbread(dev_t dev, struct uio * uio, int ioflag)
 {
 	/* not supported */
 
-	return (ENODEV);
+	return (EINVAL);
 }
 
 static int
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index d97305c1c553b..1d44ef3542021 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -132,8 +132,12 @@ smbus_request_bus(device_t bus, device_t dev, int how)
 	int s, error = 0;
 
 	/* first, ask the underlying layers if the request is ok */
-	error = SMBUS_CALLBACK(device_get_parent(bus), SMB_REQUEST_BUS,
-				(caddr_t)&how);
+	do {
+		error = SMBUS_CALLBACK(device_get_parent(bus),
+						SMB_REQUEST_BUS, (caddr_t)&how);
+		if (error)
+			error = smbus_poll(sc, how);
+	} while (error == EWOULDBLOCK);
 
 	while (!error) {
 		s = splhigh();