History

Merge tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai: "This became a relative big update as it includes the collected ASoC fixes. There are a few fixes in ASoC core side, mostly for DAPM and the new topology API. The rest are various ASoC driver-specific fixes, as well as the usual HD-audio and USB-audio quirks" * tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits) ALSA: hda - Fix MacBook Pro 5,2 quirk ALSA: hda - Fix race between PM ops and HDA init/probe ALSA: usb-audio: add dB range mapping for some devices ALSA: hda - Apply a fixup to Dell Vostro 5480 ALSA: hda - Add pin quirk for the headset mic jack detection on Dell laptop ALSA: hda - Apply fixup for another Toshiba Satellite S50D ALSA: fireworks: add support for AudioFire2 quirk ALSA: hda - Fix the headset mic that will not work on Dell desktop machine ALSA: hda - fix cs4210_spdif_automute() ASoC: pcm1681: Fix setting de-emphasis sampling rate selection ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt ASoC: sgtl5000: Fix up define for SGTL5000_SMALL_POP ASoC: dapm: Don't add prefix to widget stream name ASoC: rt5645: Check if codec is initialized in workqueue handler ASoC: Intel: Get correct usage_count value to load firmware ASoC: topology: Fix to add dapm mixer info ASoC: zx: spdif: Fix devm_ioremap_resource return value check ASoC: zx: i2s: Fix devm_ioremap_resource return value check ASoC: mediatek: Use platform_of_node for machine drivers ASoC: Free card DAPM context on snd_soc_instantiate_card() error path ...

Linus Torvalds committed 11 years ago

Commit c6fd4fc2 parents 5e49e0b 649ccd027 files · +164 −69Browse files

Showing the changes to include/uapi (1 of 27 files). Show all

Unified · Split

include/uapi/sound/asoc.h+2−2
@@ -110,7 +110,7 @@ · 109 unmodified lines
110 110
111/*111/*
112 * Block Header.112 * Block Header.
113 * This header preceeds all object and object arrays below.113 * This header precedes all object and object arrays below.
114 */114 */
115struct snd_soc_tplg_hdr {115struct snd_soc_tplg_hdr {
116 __le32 magic; /* magic number */116 __le32 magic; /* magic number */
@@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config { · 105 unmodified lines
222/*222/*
223 * Manifest. List totals for each payload type. Not used in parsing, but will223 * Manifest. List totals for each payload type. Not used in parsing, but will
224 * be passed to the component driver before any other objects in order for any224 * be passed to the component driver before any other objects in order for any
225 * global componnent resource allocations.225 * global component resource allocations.
226 *226 *
227 * File block representation for manifest :-227 * File block representation for manifest :-
228 * +-----------------------------------+----+228 * +-----------------------------------+----+