aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2003-01-21 08:56:16 +0000
commit44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch)
treef16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/pci
parent1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff)
Notes
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pci.c2
-rw-r--r--sys/dev/pci/pci_user.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 2c5e7a4f9ef3..ecdcba0a231a 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -333,7 +333,7 @@ pci_read_device(device_t pcib, int b, int s, int f, size_t size)
devlist_entry = NULL;
if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) {
- devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
+ devlist_entry = malloc(size, M_DEVBUF, M_ZERO);
if (devlist_entry == NULL)
return (NULL);
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 83b63b3ed692..d39b026e2ae1 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -307,7 +307,7 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
* Allocate a buffer to hold the patterns.
*/
pattern_buf = malloc(cio->pat_buf_len, M_TEMP,
- M_WAITOK);
+ 0);
error = copyin(cio->patterns, pattern_buf,
cio->pat_buf_len);
if (error != 0)