diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
commit | 4970c0cb6aa8996e39b1626887f5fb67a49f5ad1 (patch) | |
tree | 8e734bdf15768744a0ec03fbc715a6404a4f732b /drivers/usb/misc/chaoskey.c | |
parent | 3c0ed7d56d77b61f2177e8b72855ea32073c2091 (diff) | |
parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) |
Merge 4.3-rc5 into char-misc next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/chaoskey.c')
-rw-r--r-- | drivers/usb/misc/chaoskey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c index 3ad5d19e4d04..23c794813e6a 100644 --- a/drivers/usb/misc/chaoskey.c +++ b/drivers/usb/misc/chaoskey.c @@ -472,7 +472,7 @@ static int chaoskey_rng_read(struct hwrng *rng, void *data, if (this_time > max) this_time = max; - memcpy(data, dev->buf, this_time); + memcpy(data, dev->buf + dev->used, this_time); dev->used += this_time; |