diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 09:23:15 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 09:23:15 -0600 |
| commit | 90c80969145d006eb6294a3aa501d0e156f5e244 (patch) | |
| tree | d90095c7a4bf0067a5bc167f02ddb2e11c7880eb /drivers | |
| parent | e64df3ebe8262c8203d1fe4f541e0241c3112c01 (diff) | |
| parent | 34679ec7a0c45da8161507e1f2e1f72749dfd85c (diff) | |
Merge branch 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio
Pull virtio-rng update from Amit Shah:
"Add derating factor for use by hwrng core
Sending directly to you with the commit log changes Ted Ts'o pointed
out. Not sure if Rusty's back after his travel, but this already has
his s-o-b"
* 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio:
virtio: rng: add derating factor for use by hwrng core
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/hw_random/virtio-rng.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 0027137daa56..2e3139eda93b 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c @@ -116,6 +116,7 @@ static int probe_common(struct virtio_device *vdev) .cleanup = virtio_cleanup, .priv = (unsigned long)vi, .name = vi->name, + .quality = 1000, }; vdev->priv = vi; |