diff options
| author | Jonathan Chen <jon@FreeBSD.org> | 2000-11-27 23:55:19 +0000 |
|---|---|---|
| committer | Jonathan Chen <jon@FreeBSD.org> | 2000-11-27 23:55:19 +0000 |
| commit | a8e5d9ac32d33959cca3f2aad9bfdaa70970244b (patch) | |
| tree | a68bfd0549d0993aeaa42d4c7db04f938b9d9c25 /sys/dev | |
| parent | 4f55983606a9e95a975be22adcb98d1fe716dad8 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 2d68310f7e7a..acee08ea3fb4 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -297,10 +297,9 @@ cardbus_read_device(device_t pcib, int b, int s, int f) if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) { devlist_entry = malloc(sizeof(struct cardbus_devinfo), - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_WAITOK | M_ZERO); if (devlist_entry == NULL) return (NULL); - bzero(devlist_entry, sizeof *devlist_entry); cfg = &devlist_entry->cfg; @@ -386,12 +385,10 @@ cardbus_readppb(device_t pcib, int b, int s, int f) { pcih1cfgregs *p; - p = malloc(sizeof (pcih1cfgregs), M_DEVBUF, M_WAITOK); + p = malloc(sizeof (pcih1cfgregs), M_DEVBUF, M_WAITOK | M_ZERO); if (p == NULL) return (NULL); - bzero(p, sizeof *p); - p->secstat = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_SECSTAT_1, 2); p->bridgectl = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_BRIDGECTL_1, 2); @@ -432,12 +429,10 @@ cardbus_readpcb(device_t pcib, int b, int s, int f) { pcih2cfgregs *p; - p = malloc(sizeof (pcih2cfgregs), M_DEVBUF, M_WAITOK); + p = malloc(sizeof (pcih2cfgregs), M_DEVBUF, M_WAITOK | M_ZERO); if (p == NULL) return (NULL); - bzero(p, sizeof *p); - p->secstat = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_SECSTAT_2, 2); p->bridgectl = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_BRIDGECTL_2, 2); |