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

Flush the queue of minor fixes to pst.

Browse Source
This commit is contained in:
sos 2004-09-15 15:39:28 +00:00
parent 1795816cf7
commit 038388559e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/pst/pst-iop.h
View File

@ -42,7 +42,6 @@ struct iop_softc {
struct resource *r_mem;
struct resource *r_irq;
caddr_t ibase;
u_int32_t phys_ibase;
caddr_t obase;
u_int32_t phys_obase;
struct i2o_registers *reg;

1
sys/dev/pst/pst-pci.c
View File

@ -93,7 +93,6 @@ iop_pci_attach(device_t dev)
PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN, 1);
sc->ibase = rman_get_virtual(sc->r_mem);
sc->phys_ibase = vtophys(sc->ibase);
sc->reg = (struct i2o_registers *)sc->ibase;
sc->dev = dev;
mtx_init(&sc->mtx, "pst lock", MTX_DEF, 0);

6
sys/dev/pst/pst-raid.c
View File

@ -123,11 +123,11 @@ pst_attach(device_t dev)
if (!(psc->info = (struct i2o_bsa_device *)
malloc(sizeof(struct i2o_bsa_device), M_PSTRAID, M_NOWAIT))) {
contigfree(reply, PAGE_SIZE, M_PSTRAID);
contigfree(reply, PAGE_SIZE, M_PSTIOP);
return ENOMEM;
}
bcopy(reply->result, psc->info, sizeof(struct i2o_bsa_device));
contigfree(reply, PAGE_SIZE, M_PSTRAID);
contigfree(reply, PAGE_SIZE, M_PSTIOP);
if (!(reply = iop_get_util_params(psc->iop, psc->lct->local_tid,
I2O_PARAMS_OPERATION_FIELD_GET,
@ -145,7 +145,7 @@ pst_attach(device_t dev)
bpack(ident->vendor, ident->vendor, 16);
bpack(ident->product, ident->product, 16);
sprintf(name, "%s %s", ident->vendor, ident->product);
contigfree(reply, PAGE_SIZE, M_PSTRAID);
contigfree(reply, PAGE_SIZE, M_PSTIOP);
bioq_init(&psc->queue);