From b36e1590f4a91a00fa3ed86b3d464eab945c60d1 Mon Sep 17 00:00:00 2001 From: Hannes Hering Date: Fri, 5 Sep 2008 16:36:26 +0200 Subject: [PATCH] --- yaml --- r: 111814 b: refs/heads/master c: 70666c71957b62c8e9ea5c0d999a4bfd214c80d2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ehea/ehea_qmr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91086f25021e..590fb6e325ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 539b06fc73b1d470b9ecb3fe7af6d5f439322c08 +refs/heads/master: 70666c71957b62c8e9ea5c0d999a4bfd214c80d2 diff --git a/trunk/drivers/net/ehea/ehea_qmr.c b/trunk/drivers/net/ehea/ehea_qmr.c index 140f05baafd8..db8a9257e680 100644 --- a/trunk/drivers/net/ehea/ehea_qmr.c +++ b/trunk/drivers/net/ehea/ehea_qmr.c @@ -595,7 +595,8 @@ static int ehea_create_busmap_callback(unsigned long pfn, end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE); mr_len = *(unsigned long *)arg; - ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); + if (!ehea_bmap) + ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); if (!ehea_bmap) return -ENOMEM;