1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 91bb98c42a1c..aaf9e5afaad4 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -516,11 +516,18 @@ EXPORT_SYMBOL_GPL(hwrng_register);
 
 void hwrng_unregister(struct hwrng *rng)
 {
+        int err;
+
         mutex_lock(&rng_mutex);
 
         list_del(&rng->list);
-        if (current_rng == rng)
-                enable_best_rng();
+        if (current_rng == rng) {
+                err = enable_best_rng();
+                if (err) {
+                        drop_current_rng();
+                        cur_rng_set_by_user = 0;
+                }
+        }
 
         if (list_empty(&rng_list)) {
                 mutex_unlock(&rng_mutex);