diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2002-12-12 16:45:31 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-12-12 16:45:31 +0000 |
commit | 786228bd26d56c13fc2655431ee5ca2d4d0c9863 (patch) | |
tree | aca4bc295550c9740a43ec763881986e0b55a553 /linux/sis_ds.c | |
parent | fd621fd4a0c0033365353b6d33f132c7ef49b359 (diff) |
bring in jantorial changes from 2.5.51
Diffstat (limited to 'linux/sis_ds.c')
-rw-r--r-- | linux/sis_ds.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/linux/sis_ds.c b/linux/sis_ds.c index 95880a48..f55cf6ab 100644 --- a/linux/sis_ds.c +++ b/linux/sis_ds.c @@ -50,15 +50,16 @@ set_t *setInit(void) set_t *set; set = (set_t *)MALLOC(sizeof(set_t)); - for(i = 0; i < SET_SIZE; i++){ - set->list[i].free_next = i+1; - set->list[i].alloc_next = -1; - } - set->list[SET_SIZE-1].free_next = -1; - set->free = 0; - set->alloc = -1; - set->trace = -1; - + if (set) { + for(i = 0; i < SET_SIZE; i++){ + set->list[i].free_next = i+1; + set->list[i].alloc_next = -1; + } + set->list[SET_SIZE-1].free_next = -1; + set->free = 0; + set->alloc = -1; + set->trace = -1; + } return set; } @@ -172,7 +173,8 @@ static void *calloc(size_t nmemb, size_t size) { void *addr; addr = kmalloc(nmemb*size, GFP_KERNEL); - memset(addr, 0, nmemb*size); + if (addr) + memset(addr, 0, nmemb*size); return addr; } #define free(n) kfree(n) |