Approved by:	re (blanket)
This commit is contained in:
Olivier Houchard 2007-07-27 14:53:42 +00:00
parent 55f9380c2c
commit 0566a63ff3
2 changed files with 2 additions and 8 deletions

View File

@ -186,7 +186,7 @@ i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
if (i80321_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr))
return (-1);
bus_space_write_4(sc->sc_st, sc->sc_atu_sh, ATU_OCCAR,
addr/* & ~3*/);
addr);
va = sc->sc_atu_sh;
switch (bytes) {
@ -200,7 +200,7 @@ i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
err = badaddr_read((void *)(va + ATU_OCCDR), 4, &ret);
break;
default:
printf("i803218_read_config: invalid size %d\n", bytes);
printf("i80321_read_config: invalid size %d\n", bytes);
ret = -1;
}
if (err) {

View File

@ -128,12 +128,6 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,
rman_set_bustag(rv, bt);
rman_set_bushandle(rv, bh);
if (0) {
if (bus_activate_resource(child, type, *rid, rv)) {
rman_release_resource(rv);
return (NULL);
}
}
return (rv);
}