Sync with RELENG_3.

This commit is contained in:
Nicolas Souchu 1999-11-01 23:15:29 +00:00
parent c0b6742c79
commit 7a19171479
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=52776
4 changed files with 15 additions and 7 deletions

View File

@ -250,7 +250,7 @@ iicbus_print_child(device_t bus, device_t dev)
break;
default:
panic("%s: unknown class!\n", __FUNCTION__);
panic("%s: unknown class!", __FUNCTION__);
}
return (retval);

View File

@ -104,8 +104,12 @@ iicbus_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 = IICBUS_CALLBACK(device_get_parent(bus), IIC_REQUEST_BUS,
(caddr_t)&how);
do {
error = IICBUS_CALLBACK(device_get_parent(bus),
IIC_REQUEST_BUS, (caddr_t)&how);
if (error)
error = iicbus_poll(sc, how);
} while (error == EWOULDBLOCK);
while (!error) {
s = splhigh();

View File

@ -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

View File

@ -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();