From 83cc1d5c44c433db045ac35f8e2848c98ed9ff05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Date: Mon, 15 Oct 2012 09:57:34 +0200 Subject: [PATCH] --- yaml --- r: 347471 b: refs/heads/master c: 0127f6855e643c6b8fd5fbe3b5fa23c9d26cd237 h: refs/heads/master i: 347469: e92aa090fd0d2aca5f1551b53e29c5a0ad66c164 347467: c44dd6d94ce65c64ac26103564fc2e13afd03196 347463: 40a0a01886f11ff66b2be7320d1b102bd33a92e9 347455: b5c74865914764f2cc56b06d60f5ff3a0966ad37 v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 90643e1a26e7..bbe902fbe55c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe5295374ec9ac56ba3b619c5c1792b3fd66d859 +refs/heads/master: 0127f6855e643c6b8fd5fbe3b5fa23c9d26cd237 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 09d193dbb233..eecb1f9e2e6b 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -349,7 +349,7 @@ static struct port_buffer *alloc_buf(size_t buf_size) buf = kmalloc(sizeof(*buf), GFP_KERNEL); if (!buf) goto fail; - buf->buf = kzalloc(buf_size, GFP_KERNEL); + buf->buf = kmalloc(buf_size, GFP_KERNEL); if (!buf->buf) goto free_buf; buf->len = 0;