diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /drivers/usb/misc/chaoskey.c | |
| parent | ALSA: Remove transfer_ack_{begin,end} callbacks from struct snd_pcm_runtime (diff) | |
| parent | ASoC: cht_bsw_rt5672: Use snd_pcm_hw_constraint_single() (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz linux-274035751e25ee15a064e43cde7b4e7a9b75d921.zip | |
Merge branch 'topic/hw-constraint-single' into for-next
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; |