summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-12-23 08:40:21 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2014-12-26 00:33:35 +0300
commitff77c150f71b761dcf29b9d1947df3165d2dc83e (patch)
treec35400d6b0ae1527c41014918ec9fc77e9789261
parentac3a497f13e42a99ed6fe188ebf2dcc39eb7ac20 (diff)
downloadlinux-ff77c150f71b761dcf29b9d1947df3165d2dc83e.tar.xz
hwrng: core - Drop current rng in set_current_rng
Rather than having callers of set_current_rng call drop_current_rng, we can do it directly in set_current_rng. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/char/hw_random/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 1d342f0cb0c1..787ef42a77b9 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -70,6 +70,7 @@ module_param(default_quality, ushort, 0644);
MODULE_PARM_DESC(default_quality,
"default entropy content of hwrng per mill");
+static void drop_current_rng(void);
static void start_khwrngd(void);
static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size,
@@ -105,6 +106,7 @@ static inline void cleanup_rng(struct kref *kref)
static void set_current_rng(struct hwrng *rng)
{
BUG_ON(!mutex_is_locked(&rng_mutex));
+ drop_current_rng();
current_rng = rng;
}
@@ -315,7 +317,6 @@ static ssize_t hwrng_attr_current_store(struct device *dev,
err = hwrng_init(rng);
if (err)
break;
- drop_current_rng();
set_current_rng(rng);
err = 0;
break;