From 1a4557d31edad8167b3f51e367a641803786fc4d Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Mon, 22 Apr 2013 01:12:27 +0000 Subject: [PATCH] --- yaml --- r: 369369 b: refs/heads/master c: 4a912f9822f532d3988784600d84478667eca1bd h: refs/heads/master i: 369367: 5cc3ebdaef3dd00531ed1d37d47259ea94fc3c94 v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_core_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0781a425707..3c8cd6a52356 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03393fd5cc2b6cdeec32b704ecba64dbb0feae3c +refs/heads/master: 4a912f9822f532d3988784600d84478667eca1bd diff --git a/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c index 0d73a999983d..3a89ab73f668 100644 --- a/trunk/drivers/s390/net/qeth_core_main.c +++ b/trunk/drivers/s390/net/qeth_core_main.c @@ -316,7 +316,7 @@ static inline int qeth_alloc_cq(struct qeth_card *card) card->qdio.no_in_queues = 2; - card->qdio.out_bufstates = (struct qdio_outbuf_state *) + card->qdio.out_bufstates = kzalloc(card->qdio.no_out_queues * QDIO_MAX_BUFFERS_PER_Q * sizeof(struct qdio_outbuf_state), GFP_KERNEL);