From 7d2eb02b322c0bffd98396fc695a8f0a301af4aa Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Wed, 5 May 2010 15:27:30 -0400 Subject: [PATCH] --- yaml --- r: 197289 b: refs/heads/master c: 7e052d98f2bbcaaaa6d509081d78e600927cfe60 h: refs/heads/master i: 197287: fb942ac2677261d2102f36b076614e566f3e7d6c v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/Channel.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 461d5145ba6f..b4ae2cf2b595 100644 --- 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 index de2ccb1082ce..d939723db335 100644 --- 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);