Merge branch 'for-2.6.33' into for-2.6.34

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index e989f67bb61..3d9c61e5acb 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -158,10 +158,11 @@ static ssize_t rng_dev_read(struct file *filp, char __user *buf,
                         goto out;
                 }
         }
-out_unlock:
-        mutex_unlock(&rng_mutex);
 out:
         return ret ? : err;
+out_unlock:
+        mutex_unlock(&rng_mutex);
+        goto out;
 }