summaryrefslogtreecommitdiff
path: root/sys/src/9/pc/usbuhci.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@centraldogma>2011-12-12 16:55:26 +0100
committercinap_lenrek <cinap_lenrek@centraldogma>2011-12-12 16:55:26 +0100
commitbf3476d661e05208b78f70cdaa5656ff77264d23 (patch)
treef5c52910b93aa74586740a54f6b2911e95ae96cc /sys/src/9/pc/usbuhci.c
parent589f99915eb95d9207c08259c8880675a0a502cf (diff)
kernel: fix inproper use of malloc/smalloc
Diffstat (limited to 'sys/src/9/pc/usbuhci.c')
-rw-r--r--sys/src/9/pc/usbuhci.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/src/9/pc/usbuhci.c b/sys/src/9/pc/usbuhci.c
index 3b3af719f..a063fcd9a 100644
--- a/sys/src/9/pc/usbuhci.c
+++ b/sys/src/9/pc/usbuhci.c
@@ -2139,7 +2139,12 @@ scanpci(void)
dprint("uhci: %#x %#x: port %#ux size %#x irq %d\n",
p->vid, p->did, io, p->mem[4].size, p->intl);
- ctlr = smalloc(sizeof(Ctlr));
+ ctlr = malloc(sizeof(Ctlr));
+ if(ctlr == nil){
+ iofree(io);
+ print("usbuhci: no memory\n");
+ continue;
+ }
ctlr->pcidev = p;
ctlr->port = io;
for(i = 0; i < Nhcis; i++)
@@ -2148,7 +2153,7 @@ scanpci(void)
break;
}
if(i == Nhcis)
- print("uhci: bug: no more controllers\n");
+ print("usbuhci: bug: no more controllers\n");
}
}