summaryrefslogtreecommitdiffstats
path: root/sys/cam/scsi/scsi_ch.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/cam/scsi/scsi_ch.c')
-rw-r--r--sys/cam/scsi/scsi_ch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index fcbb53b..51f6946 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -1100,7 +1100,7 @@ chgetelemstatus(struct cam_periph *periph,
* we can allocate enough storage for all of them. We assume
* that the first one can fit into 1k.
*/
- data = (caddr_t)malloc(1024, M_DEVBUF, M_WAITOK);
+ data = (caddr_t)malloc(1024, M_DEVBUF, 0);
ccb = cam_periph_getccb(periph, /*priority*/ 1);
@@ -1137,7 +1137,7 @@ chgetelemstatus(struct cam_periph *periph,
* device.
*/
free(data, M_DEVBUF);
- data = (caddr_t)malloc(size, M_DEVBUF, M_WAITOK);
+ data = (caddr_t)malloc(size, M_DEVBUF, 0);
scsi_read_element_status(&ccb->csio,
/* retries */ 1,
@@ -1172,7 +1172,7 @@ chgetelemstatus(struct cam_periph *periph,
user_data = (struct changer_element_status *)
malloc(avail * sizeof(struct changer_element_status),
- M_DEVBUF, M_WAITOK | M_ZERO);
+ M_DEVBUF, M_ZERO);
desc = (struct read_element_status_descriptor *)((uintptr_t)data +
sizeof(struct read_element_status_header) +
OpenPOWER on IntegriCloud