d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with RELENG_3.

Browse Source
This commit is contained in:
nsouch 1999-11-01 23:15:29 +00:00
parent 373247212e
commit bfcfa15e68
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/iicbus/iicbus.c
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);

8
sys/dev/iicbus/iiconf.c
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();

4
sys/dev/smbus/smb.c
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

8
sys/dev/smbus/smbconf.c
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();