From 2c35715f584afd8f2ea479492d551e6ad655d0cd Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 7 Nov 2010 22:04:43 +0100
Subject: [PATCH] --- yaml --- r: 221941 b: refs/heads/master c:
 793b62337ecf1bf9a816fcb7105bb1ca424cf7d4 h: refs/heads/master i:   221939:
 a95bb51e058e57189dab281f4c15e3b8eddd8d49 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/uwb/allocator.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 47a9393d66df..2653f67e21d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 886ccd4520064408ce5876cfe00554ce52ecf4a7
+refs/heads/master: 793b62337ecf1bf9a816fcb7105bb1ca424cf7d4
diff --git a/trunk/drivers/uwb/allocator.c b/trunk/drivers/uwb/allocator.c
index 436e4f7110cb..e45e673b8770 100644
--- a/trunk/drivers/uwb/allocator.c
+++ b/trunk/drivers/uwb/allocator.c
@@ -326,7 +326,8 @@ int uwb_rsv_find_best_allocation(struct uwb_rsv *rsv, struct uwb_mas_bm *availab
 	int bit_index;
 
 	ai = kzalloc(sizeof(struct uwb_rsv_alloc_info), GFP_KERNEL);
-	
+	if (!ai)
+		return UWB_RSV_ALLOC_NOT_FOUND;
 	ai->min_mas = rsv->min_mas;
 	ai->max_mas = rsv->max_mas;
 	ai->max_interval = rsv->max_interval;