X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Ftipc%2Fzone.c;fp=net%2Ftipc%2Fzone.c;h=f5b00ea2d5acb2cb77d46d7ec3c2265fe3c16700;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=2803e1b4f17065d2e4988684a527da23221eba98;hpb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;p=linux-2.6.git diff --git a/net/tipc/zone.c b/net/tipc/zone.c index 2803e1b4f..f5b00ea2d 100644 --- a/net/tipc/zone.c +++ b/net/tipc/zone.c @@ -44,19 +44,23 @@ struct _zone *tipc_zone_create(u32 addr) { - struct _zone *z_ptr = NULL; + struct _zone *z_ptr; u32 z_num; - if (!tipc_addr_domain_valid(addr)) + if (!tipc_addr_domain_valid(addr)) { + err("Zone creation failed, invalid domain 0x%x\n", addr); return NULL; + } - z_ptr = (struct _zone *)kmalloc(sizeof(*z_ptr), GFP_ATOMIC); - if (z_ptr != NULL) { - memset(z_ptr, 0, sizeof(*z_ptr)); - z_num = tipc_zone(addr); - z_ptr->addr = tipc_addr(z_num, 0, 0); - tipc_net.zones[z_num] = z_ptr; + z_ptr = kzalloc(sizeof(*z_ptr), GFP_ATOMIC); + if (!z_ptr) { + warn("Zone creation failed, insufficient memory\n"); + return NULL; } + + z_num = tipc_zone(addr); + z_ptr->addr = tipc_addr(z_num, 0, 0); + tipc_net.zones[z_num] = z_ptr; return z_ptr; }