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 | |
| parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| download | linux-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.gz linux-998052b74574699bdd1e451b6556e4d7667a7a4e.tar.bz2 linux-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')
| -rw-r--r-- | sound/core/info.c | 4 | ||||
| -rw-r--r-- | sound/core/pcm_misc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index 051d55b05521..9f404e965ea2 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -684,7 +684,7 @@ int snd_info_card_free(struct snd_card *card) * snd_info_get_line - read one line from the procfs buffer * @buffer: the procfs buffer * @line: the buffer to store - * @len: the max. buffer size - 1 + * @len: the max. buffer size * * Reads one line from the buffer and stores the string. * @@ -704,7 +704,7 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) buffer->stop = 1; if (c == '\n') break; - if (len) { + if (len > 1) { len--; *line++ = c; } 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, |