diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h
index 26612bf99..f3b6dab38 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_bitmap.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_bitmap.c
index 2ddabc62e..29f52081c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_bitmap.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_bitmap.c
@@ -285,7 +285,7 @@ static void gk20a_bitmap_free(struct gk20a_allocator *__a, u64 addr)
 	blks = alloc->length >> a->blk_shift;
 
 	bitmap_clear(a->bitmap, offs, blks);
-	alloc_dbg(__a, "Free  0x%-10llx \n", addr);
+	alloc_dbg(__a, "Free  0x%-10llx\n", addr);
 
 	a->bytes_freed += alloc->length;
 
@@ -400,7 +400,7 @@ int gk20a_bitmap_allocator_init(struct gk20a_allocator *__a,
 	a->bit_offs = a->base >> a->blk_shift;
 	a->flags = flags;
 
-	a->bitmap = kzalloc(sizeof(*a->bitmap) * BITS_TO_LONGS(a->num_bits),
+	a->bitmap = kcalloc(BITS_TO_LONGS(a->num_bits), sizeof(*a->bitmap),
 			    GFP_KERNEL);
 	if (!a->bitmap)
 		goto fail;