summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2011-09-22 21:36:01 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2011-09-22 21:36:01 +0000
commitc5fe639b67b7bdf1a95c3100d73481eab56e6027 (patch)
treeeac885a1efca0c3beb0478673217cd7d911413a6
parenteead1e4a62b3951e1e4bd48159b73355a7836806 (diff)
Fix order of arguments passed to malloc(9) - type first then flags.
-rw-r--r--sys/scsi/scsiconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 824e6968491..7ab9a02d207 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.181 2011/09/02 01:19:12 dlg Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.182 2011/09/22 21:36:00 jsing Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -1285,7 +1285,7 @@ scsi_devid_pg80(struct scsi_link *link)
goto free;
id = malloc(sizeof(link->inqdata.vendor) +
- sizeof(link->inqdata.product) + len, M_WAITOK, M_TEMP);
+ sizeof(link->inqdata.product) + len, M_TEMP, M_WAITOK);
memcpy(id, link->inqdata.vendor, sizeof(link->inqdata.vendor));
memcpy(id + sizeof(link->inqdata.vendor), link->inqdata.product,
sizeof(link->inqdata.product));