diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-11 13:43:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-11 13:43:49 +0200 |
commit | 998052b74574699bdd1e451b6556e4d7667a7a4e (patch) | |
tree | 3124898e873cdec28f724106e60d1bff760505f1 /sound/core/pcm_misc.c | |
parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
download | linux-stable-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.gz linux-stable-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.bz2 linux-stable-998052b74574699bdd1e451b6556e4d7667a7a4e.zip |
Merge branch 'for-linus' into for-next
Merging for-linus branch for syncing the latest STAC/IDT codec
changes to be affected by the upcoming hda-jack rewrites.
Diffstat (limited to 'sound/core/pcm_misc.c')
-rw-r--r-- | sound/core/pcm_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c index 83f54e1dbac9..ae7a0feb3b76 100644 --- a/sound/core/pcm_misc.c +++ b/sound/core/pcm_misc.c @@ -142,11 +142,11 @@ static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = { }, [SNDRV_PCM_FORMAT_DSD_U8] = { .width = 8, .phys = 8, .le = 1, .signd = 0, - .silence = {}, + .silence = { 0x69 }, }, [SNDRV_PCM_FORMAT_DSD_U16_LE] = { .width = 16, .phys = 16, .le = 1, .signd = 0, - .silence = {}, + .silence = { 0x69, 0x69 }, }, [SNDRV_PCM_FORMAT_DSD_U32_LE] = { .width = 32, .phys = 32, .le = 1, .signd = 0, |