From dfd4ec78bb7311dffc68c2475f71240f7835bac7 Mon Sep 17 00:00:00 2001
From: Amit Shah <amit.shah@redhat.com>
Date: Mon, 28 May 2012 12:18:40 +0530
Subject: [PATCH] --- yaml --- r: 319815 b: refs/heads/master c:
 cc8744e12936680478ce82b0f21dbaa272df1447 h: refs/heads/master i:   319813:
 5244c00bd601173c64fed89a6ea27111a5abc28c   319811:
 9f7c3c229cc93ea2b813039780c50c466951f084   319807:
 27655db887eedf7351e5166a93fbadf41ac50e7a v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/hw_random/virtio-rng.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c96eb6baf045..0be21aed813d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddcc286900732953ac2e950b6ad0f9a4933767fb
+refs/heads/master: cc8744e12936680478ce82b0f21dbaa272df1447
diff --git a/trunk/drivers/char/hw_random/virtio-rng.c b/trunk/drivers/char/hw_random/virtio-rng.c
index 723725bbb96b..c8a935034218 100644
--- a/trunk/drivers/char/hw_random/virtio-rng.c
+++ b/trunk/drivers/char/hw_random/virtio-rng.c
@@ -55,6 +55,7 @@ static void register_buffer(u8 *buf, size_t size)
 
 static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
 {
+	int ret;
 
 	if (!busy) {
 		busy = true;
@@ -65,7 +66,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
 	if (!wait)
 		return 0;
 
-	wait_for_completion(&have_data);
+	ret = wait_for_completion_killable(&have_data);
+	if (ret < 0)
+		return ret;
 
 	busy = false;