From fae0476d9674fb7f3d63019b487d31c5b43d983d Mon Sep 17 00:00:00 2001
From: Ralph Wuerthner <rwuerthn@de.ibm.com>
Date: Thu, 17 Apr 2008 07:46:14 +0200
Subject: [PATCH] --- yaml --- r: 88421 b: refs/heads/master c:
 893f11286644780fc7d6d415e537644da7bdaaf8 h: refs/heads/master i:   88419:
 03c7bdfc42d95cc13c2b7e346e8b13f6ab24cb9d v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/hw_random/core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0a7ec986adba..ac211a2d58e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c10fde0d9e2112c25052a8742e893ec5965c0007
+refs/heads/master: 893f11286644780fc7d6d415e537644da7bdaaf8
diff --git a/trunk/drivers/char/hw_random/core.c b/trunk/drivers/char/hw_random/core.c
index 84cdf9025737..349b6edc5794 100644
--- a/trunk/drivers/char/hw_random/core.c
+++ b/trunk/drivers/char/hw_random/core.c
@@ -116,6 +116,10 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf,
 		err = -EAGAIN;
 		if (!bytes_read && (filp->f_flags & O_NONBLOCK))
 			goto out;
+		if (bytes_read < 0) {
+			err = bytes_read;
+			goto out;
+		}
 
 		err = -EFAULT;
 		while (bytes_read && size) {