From: Bill Pemberton <wfp5p@virginia.edu>
Date: Wed, 5 May 2010 19:27:30 +0000 (-0400)
Subject: Staging: hv: check return value of osd_PageAlloc()
X-Git-Tag: MMI-PSA29.97-13-9~23841^2^2~176
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e052d98f2bbcaaaa6d509081d78e600927cfe60;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: hv: check return value of osd_PageAlloc()

The return value of osd_PageAlloc() was checked using an ASSERT().
Change that to more useful behaviour.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index de2ccb1082ce..d939723db335 100644
--- a/drivers/staging/hv/Channel.c
+++ b/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);