diff options
| author | Linus Torvalds | 2014-06-13 16:42:49 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-13 16:42:49 +0200 |
| commit | 6391f34e844c71ebf645058b2b643f70fed5b990 (patch) | |
| tree | 047ddfa92471f44037a984b78d05161c101ec423 /sound/firewire/fireworks/fireworks_hwdep.c | |
| parent | Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teiglan... (diff) | |
| parent | ALSA: hda/realtek - Add more entry for enable HP mute led (diff) | |
| download | kernel-qcow2-linux-6391f34e844c71ebf645058b2b643f70fed5b990.tar.gz kernel-qcow2-linux-6391f34e844c71ebf645058b2b643f70fed5b990.tar.xz kernel-qcow2-linux-6391f34e844c71ebf645058b2b643f70fed5b990.zip | |
Merge tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Most of changes are small and easy cleanup or fixes:
- a few HD-audio Realtek codec fixes and quirks
- Intel HDMI audio fixes for Broadwell and Haswell / ValleyView
- FireWire sound stack cleanups
- a couple of sequencer core fixes
- compress ABI fix for 64bit
- conversion to modern ktime*() API"
* tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
ALSA: hda/realtek - Add more entry for enable HP mute led
ALSA: hda - Add quirk for external mic on Lifebook U904
ALSA: hda - fix a fixup value for codec alc293 in the pin_quirk table
ALSA: intel8x0: Use ktime and ktime_get()
ALSA: core: Use ktime_get_ts()
ALSA: hda - verify pin:converter connection on unsol event for HSW and VLV
ALSA: compress: Cancel the optimization of compiler and fix the size of struct for all platform.
ALSA: hda - Add quirk for ABit AA8XE
Revert "ALSA: hda - mask buggy stream DMA0 for Broadwell display controller"
ALSA: hda - using POS_FIX_LPIB on Broadwell HDMI Audio
ALSA: hda/realtek - Add support of ALC667 codec
ALSA: hda/realtek - Add more codec rename
ALSA: hda/realtek - New vendor ID for ALC233
ALSA: hda - add two new pin tables
ALSA: hda/realtek - Add support of ALC891 codec
ALSA: seq: Continue broadcasting events to ports if one of them fails
ALSA: bebob: Remove unused function prototype
ALSA: fireworks: Remove meaningless mutex_destroy()
ALSA: fireworks: Remove a constant over width to which it's applied
ALSA: fireworks: Improve comments about Fireworks transaction
...
Diffstat (limited to 'sound/firewire/fireworks/fireworks_hwdep.c')
| -rw-r--r-- | sound/firewire/fireworks/fireworks_hwdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/fireworks/fireworks_hwdep.c b/sound/firewire/fireworks/fireworks_hwdep.c index 4f8216fb6b62..33df8655fe81 100644 --- a/sound/firewire/fireworks/fireworks_hwdep.c +++ b/sound/firewire/fireworks/fireworks_hwdep.c @@ -58,7 +58,7 @@ hwdep_read_resp_buf(struct snd_efw *efw, char __user *buf, long remained, efw->pull_ptr += till_end; if (efw->pull_ptr >= efw->resp_buf + snd_efw_resp_buf_size) - efw->pull_ptr = efw->resp_buf; + efw->pull_ptr -= snd_efw_resp_buf_size; length -= till_end; buf += till_end; |