diff options
| author |   krw <krw@openbsd.org> | 2019-11-28 16:27:35 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2019-11-28 16:27:35 +0000 |
| commit | 944c98ada58d6e56d4857b9ad65c44c67917a07a (patch) | |
| tree | b1c8fd52bc26e83033bec06383e6403498ba35b7 /sys/scsi/scsi_base.c | |
| parent | ks_mapblocks is gone (diff) | |
| download | wireguard-openbsd-944c98ada58d6e56d4857b9ad65c44c67917a07a.tar.xz wireguard-openbsd-944c98ada58d6e56d4857b9ad65c44c67917a07a.zip | |
Always pass a pointer to 'big' to scsi_do_mode_sense().
Sets up some simplifications.
Diffstat (limited to 'sys/scsi/scsi_base.c')
| -rw-r--r-- | sys/scsi/scsi_base.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 6c2cb6921d7..78814ff4c71 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.245 2019/11/26 20:48:03 krw Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.246 2019/11/28 16:27:35 krw Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -1168,9 +1168,7 @@ scsi_do_mode_sense(struct scsi_link *link, int page, int error, blk_desc_len, offset; *page_data = NULL; - - if (big != NULL) - *big = 0; + *big = 0; if (!ISSET(link->flags, SDEV_ATAPI) || (link->inqdata.device & SID_TYPE) == T_SEQUENTIAL) { @@ -1221,8 +1219,7 @@ scsi_do_mode_sense(struct scsi_link *link, int page, if (_2btol(buf->hdr_big.data_length) < 6) return (EIO); - if (big != NULL) - *big = 1; + *big = 1; offset = sizeof(struct scsi_mode_header_big); *page_data = scsi_mode_sense_big_page(&buf->hdr_big, page_len); blk_desc_len = _2btol(buf->hdr_big.blk_desc_len); |