Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff77c150 authored by Herbert Xu's avatar Herbert Xu
Browse files

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ac3a497f

drivers/char/hw_random/core.c

+2 −1
Original line number Diff line number Diff line
@@ -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;