diff --git a/[refs] b/[refs]
index 8f42ba5fa3be..719e371bcd7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3324fb405340cf52fe361697a86d235587402d9c
+refs/heads/master: a16e1485c758c236915ac1956694d11bff5e5daa
diff --git a/trunk/drivers/staging/hv/RingBuffer.c b/trunk/drivers/staging/hv/RingBuffer.c
index 69f3ebae15a9..64f8d0f9e05c 100644
--- a/trunk/drivers/staging/hv/RingBuffer.c
+++ b/trunk/drivers/staging/hv/RingBuffer.c
@@ -490,7 +490,8 @@ int RingBufferRead(RING_BUFFER_INFO *InRingInfo, void *Buffer,
 	u64 prevIndices = 0;
 	unsigned long flags;
 
-	ASSERT(BufferLen > 0);
+	if (BufferLen <= 0)
+		return -EINVAL;
 
 	spin_lock_irqsave(&InRingInfo->ring_lock, flags);