From 80b3657a6f370f31b35d6f1111c4be643991eb76 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 8 Nov 2006 19:49:15 -0800 Subject: [PATCH] --- yaml --- r: 40851 b: refs/heads/master c: 92b1f905637bbd79fcd430a09737fd97061eb405 h: refs/heads/master i: 40849: c94049383a3d08bb8c596daea7a4b1650f747381 40847: 37b86d3c2d646e12daef07e78f2649d151f0d3ff v: v3 --- [refs] | 2 +- trunk/drivers/net/cris/eth_v10.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9a806db33c0c..d306dd8f2fd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ace48ffb5d6c927c5a98048d93543e1cae0eebd0 +refs/heads/master: 92b1f905637bbd79fcd430a09737fd97061eb405 diff --git a/trunk/drivers/net/cris/eth_v10.c b/trunk/drivers/net/cris/eth_v10.c index 966b563e42bb..a03d781f6d0a 100644 --- a/trunk/drivers/net/cris/eth_v10.c +++ b/trunk/drivers/net/cris/eth_v10.c @@ -509,6 +509,8 @@ etrax_ethernet_init(void) * does not share cacheline with any other data (to avoid cache bug) */ RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES); + if (!RxDescList[i].skb) + return -ENOMEM; RxDescList[i].descr.ctrl = 0; RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE; RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]);