---

yaml --- r: 197289 b: refs/heads/master c: 7e052d9 h: refs/heads/master i: 197287: fb942ac v: v3
git-mirror · May 11, 2010 · 7d2eb02 · 7d2eb02
1 parent f672efe
commit 7d2eb02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75910f236a30bded00f078cab994f35a7171c39b
+refs/heads/master: 7e052d98f2bbcaaaa6d509081d78e600927cfe60
diff --git a/trunk/drivers/staging/hv/Channel.c b/trunk/drivers/staging/hv/Channel.c
@@ -192,7 +192,9 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
 	/* Allocate the ring buffer */
 	out = osd_PageAlloc((SendRingBufferSize + RecvRingBufferSize)
 			     >> PAGE_SHIFT);
-	ASSERT(out);
+	if (!out)
+		return -ENOMEM;
+
 	ASSERT(((unsigned long)out & (PAGE_SIZE-1)) == 0);
 
 	in = (void *)((unsigned long)out + SendRingBufferSize);