diff options
| author |   grange <grange@openbsd.org> | 2009-03-01 15:35:10 +0000 |
|---|---|---|
| committer | grange <grange@openbsd.org> | 2009-03-01 15:35:10 +0000 |
| commit | 768e6c39a8e84e4142d3db1660bfcb007f356774 (patch) | |
| tree | f5615c100e30a5609f5eed6d35ec5181af3a305c | |
| parent | fix possible NULL dereference when getpwnam fails; ok gilles@ (diff) | |
| download | wireguard-openbsd-768e6c39a8e84e4142d3db1660bfcb007f356774.tar.xz wireguard-openbsd-768e6c39a8e84e4142d3db1660bfcb007f356774.zip | |
- add missing letoh32
- tweak product string
| -rw-r--r-- | sys/dev/pci/ips.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 2ba4188d4f5..abb5105a5d4 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.48 2009/02/19 16:06:56 grange Exp $ */ +/* $OpenBSD: ips.c,v 1.49 2009/03/01 15:35:10 grange Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -755,7 +755,7 @@ ips_scsi_cmd(struct scsi_xfer *xs) inq.additional_length = 32; strlcpy(inq.vendor, "IBM", sizeof(inq.vendor)); snprintf(inq.product, sizeof(inq.product), - "RAID%d #%02d", drive->raid, target); + "LD%d RAID%d", target, drive->raid); strlcpy(inq.revision, "1.0", sizeof(inq.revision)); memcpy(xs->data, &inq, MIN(xs->datalen, sizeof(inq))); break; @@ -1261,7 +1261,7 @@ ips_copperhead_status(struct ips_softc *sc) sc->sc_sqtail = sqtail; if (++sc->sc_sqidx == IPS_MAXCMDS) sc->sc_sqidx = 0; - status = sc->sc_sqbuf[sc->sc_sqidx]; + status = letoh32(sc->sc_sqbuf[sc->sc_sqidx]); bus_space_write_4(sc->sc_iot, sc->sc_ioh, IPS_REG_SQT, sqtail); return (status); |