Merge tag 'platform-drivers-x86-v4.18-1' of git://git.infradead.org/linux-platform...

[linux.git] / block / blk-tag.c

diff --git a/block/blk-tag.c b/block/blk-tag.c
index 09f19c6c52ceb209868485e7a824c282df2b6fe6..24b20d86bcbcb3f160498fdf3eb5409f9a8730f4 100644 (file)
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
@@ -99,12 +99,12 @@ init_tag_map(struct request_queue *q, struct blk_queue_tag *tags, int depth)
                       __func__, depth);
        }
 
-       tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);
+       tag_index = kcalloc(depth, sizeof(struct request *), GFP_ATOMIC);
        if (!tag_index)
                goto fail;
 
        nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
-       tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
+       tag_map = kcalloc(nr_ulongs, sizeof(unsigned long), GFP_ATOMIC);
        if (!tag_map)
                goto fail;