diff options
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/cd.c | 8 | ||||
-rw-r--r-- | sys/scsi/ch.c | 6 | ||||
-rw-r--r-- | sys/scsi/sd.c | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index d8b60247f2f..c9b316861bd 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.223 2019/01/20 03:28:19 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.224 2019/01/20 20:28:37 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -482,7 +482,7 @@ cdstrategy(struct buf *bp) device_unref(&sc->sc_dev); return; - bad: +bad: SET(bp->b_flags, B_ERROR); bp->b_resid = bp->b_bcount; done: @@ -1035,7 +1035,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) error = scsi_start(sc->sc_link, SSS_STOP, 0); break; - close_tray: +close_tray: case CDIOCCLOSE: error = scsi_start(sc->sc_link, SSS_START|SSS_LOEJ, SCSI_IGNORE_NOT_READY | SCSI_IGNORE_MEDIA_CHANGE); @@ -1095,7 +1095,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) break; } - exit: +exit: device_unref(&sc->sc_dev); return (error); diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 4b63404aa31..583c1b28a3a 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.52 2016/03/12 15:16:04 krw Exp $ */ +/* $OpenBSD: ch.c,v 1.53 2019/01/20 20:28:37 krw Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -240,7 +240,7 @@ chopen(dev_t dev, int flags, int fmt, struct proc *p) return (0); - bad: +bad: sc->sc_link->flags &= ~SDEV_OPEN; return (error); } @@ -610,7 +610,7 @@ ch_usergetelemstatus(struct ch_softc *sc, /* Copy array out to userspace. */ error = copyout(user_data, cesr->cesr_data, udsize); - done: +done: if (data != NULL) dma_free(data, size); if (user_data != NULL) diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 6839e6605fa..8ec1b08f2d7 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.276 2019/01/20 03:28:19 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.277 2019/01/20 20:28:37 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -600,7 +600,7 @@ sdstrategy(struct buf *bp) device_unref(&sc->sc_dev); return; - bad: +bad: SET(bp->b_flags, B_ERROR); bp->b_resid = bp->b_bcount; done: @@ -1467,7 +1467,7 @@ sd_read_cap_10(struct sd_softc *sc, int flags) CLR(sc->flags, SDF_THIN); } - done: +done: dma_free(rdcap, sizeof(*rdcap)); return (rv); } @@ -1523,7 +1523,7 @@ sd_read_cap_16(struct sd_softc *sc, int flags) CLR(sc->flags, SDF_THIN); } - done: +done: dma_free(rdcap, sizeof(*rdcap)); return (rv); } @@ -1606,7 +1606,7 @@ sd_thin_pages(struct sd_softc *sc, int flags) if (score < 2) rv = EOPNOTSUPP; - done: +done: dma_free(pg, sizeof(*pg) + len); return (rv); } @@ -1637,7 +1637,7 @@ sd_vpd_block_limits(struct sd_softc *sc, int flags) } else rv = EOPNOTSUPP; - done: +done: dma_free(pg, sizeof(*pg)); return (rv); } @@ -1672,7 +1672,7 @@ sd_vpd_thin(struct sd_softc *sc, int flags) rv = EOPNOTSUPP; #endif - done: +done: dma_free(pg, sizeof(*pg)); return (rv); } |