aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/cardbus
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
committerWarner Losh <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
commita163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch)
tree9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/dev/cardbus
parent8f3e32c2b6b9f392e096f096653596f55f2134ae (diff)
Notes
Diffstat (limited to 'sys/dev/cardbus')
-rw-r--r--sys/dev/cardbus/cardbus_cis.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 250ac65916b85..adee34dac4116 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -201,7 +201,7 @@ decode_tuple_copy(device_t cbdev, device_t child, int id,
struct cis_tupleinfo *tmpbuf;
tmpbuf = malloc(sizeof(struct cis_tupleinfo) * (ncisread_buf+1),
- M_DEVBUF, 0);
+ M_DEVBUF, M_WAITOK);
if (ncisread_buf > 0) {
memcpy(tmpbuf, cisread_buf,
sizeof(struct cis_tupleinfo) * ncisread_buf);
@@ -211,7 +211,7 @@ decode_tuple_copy(device_t cbdev, device_t child, int id,
cisread_buf[ncisread_buf].id = id;
cisread_buf[ncisread_buf].len = len;
- cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, 0);
+ cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, M_WAITOK);
memcpy(cisread_buf[ncisread_buf].data, tupledata, len);
ncisread_buf++;
return (0);
@@ -804,7 +804,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
if (count == 0)
return (0);
barlist = malloc(sizeof(struct resource_list_entry*) * count, M_DEVBUF,
- 0);
+ M_WAITOK);
count = 0;
SLIST_FOREACH(rle, &dinfo->pci.resources, link) {
barlist[count] = rle;