diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
| commit | 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch) | |
| tree | 225ed7efcc0bb7e3c90233576c6106538e17a275 /sound/soc/davinci/davinci-pcm.c | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| parent | Merge branch 'for-2.6.34' of git://opensource.wolfsonmicro.com/linux-2.6-asoc... (diff) | |
| download | linux-6679ee1870f7ccdd48e2e5c57919240b8f19a6dc.tar.xz linux-6679ee1870f7ccdd48e2e5c57919240b8f19a6dc.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index ad4d7f47a86b..80c7fdf2f521 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -49,7 +49,7 @@ static void print_buf_info(int slot, char *name) static struct snd_pcm_hardware pcm_hardware_playback = { .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE), + SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), .formats = (SNDRV_PCM_FMTBIT_S16_LE), .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | |