Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (299 commits)
  [ALSA] version 1.0.16rc2
  [ALSA] hda: fix Mic in as output
  [ALSA] emu10k1 - Another EMU0404 Board ID
  [ALSA] emu10k1 - Fix kthread handling at resume
  [ALSA] emu10k1: General cleanup, add new locks, fix alsa bug#3501, kernel bug#9304.
  [ALSA] emu10k1 - Use enum for emu_model types
  [ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards
  [ALSA] emu10k1 - 1616(M) cardbus improvements
  [ALSA] snd:emu10k1: E-Mu updates. Fixes to firmware loading and support for 0404.
  [ALSA] emu10k1: Add comments regarding E-Mu ins and outs.
  [ALSA] oxygen: revert SPI clock frequency change for AK4396/WM8785
  [ALSA] es1938 - improve capture hw pointer reads
  [ALSA] HDA-Intel - Add support for Intel SCH
  [ALSA] hda: Add GPIO mute support to STAC9205
  [ALSA] hda-codec - Add Dell T3400 support
  [ALSA] hda-codec - Add model for HP DV9553EG laptop
  [ALSA] hda-codec - Control SPDIF as slave
  [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's
  [ALSA] Fix Oops with PCM OSS sync
  [ALSA] hda-codec - Add speaker automute to ALC262 HP models
  ...

1 files changed, 25 insertions, 24 deletions

diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index 4107a87d4de3..29a6c82f873a 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -49,7 +48,9 @@ static const struct snd_pcm_hardware s3c24xx_pcm_hardware = {
         .info                   = SNDRV_PCM_INFO_INTERLEAVED |
                                     SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                     SNDRV_PCM_INFO_MMAP |
-                                    SNDRV_PCM_INFO_MMAP_VALID,
+                                    SNDRV_PCM_INFO_MMAP_VALID |
+                                    SNDRV_PCM_INFO_PAUSE |
+                                    SNDRV_PCM_INFO_RESUME,
         .formats                = SNDRV_PCM_FMTBIT_S16_LE |
                                     SNDRV_PCM_FMTBIT_U16_LE |
                                     SNDRV_PCM_FMTBIT_U8 |
@@ -176,28 +177,6 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
                 }
         }
 
-        /* channel needs configuring for mem=>device, increment memory addr,
-         * sync to pclk, half-word transfers to the IIS-FIFO. */
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                s3c2410_dma_devconfig(prtd->params->channel,
-                                S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
-                                S3C2410_DISRCC_APB, prtd->params->dma_addr);
-
-                s3c2410_dma_config(prtd->params->channel,
-                                prtd->params->dma_size,
-                                S3C2410_DCON_SYNC_PCLK | 
-                                S3C2410_DCON_HANDSHAKE);
-        } else {
-                s3c2410_dma_config(prtd->params->channel,
-                                prtd->params->dma_size,
-                                S3C2410_DCON_HANDSHAKE | 
-                                S3C2410_DCON_SYNC_PCLK);
-
-                s3c2410_dma_devconfig(prtd->params->channel,
-                                        S3C2410_DMASRC_HW, 0x3,
-                                        prtd->params->dma_addr);
-        }
-
         s3c2410_dma_set_buffdone_fn(prtd->params->channel,
                                     s3c24xx_audio_buffdone);
 
@@ -246,6 +225,28 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream)
         if (!prtd->params)
                 return 0;
 
+        /* channel needs configuring for mem=>device, increment memory addr,
+         * sync to pclk, half-word transfers to the IIS-FIFO. */
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                s3c2410_dma_devconfig(prtd->params->channel,
+                                S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
+                                S3C2410_DISRCC_APB, prtd->params->dma_addr);
+
+                s3c2410_dma_config(prtd->params->channel,
+                                prtd->params->dma_size,
+                                S3C2410_DCON_SYNC_PCLK |
+                                S3C2410_DCON_HANDSHAKE);
+        } else {
+                s3c2410_dma_config(prtd->params->channel,
+                                prtd->params->dma_size,
+                                S3C2410_DCON_HANDSHAKE |
+                                S3C2410_DCON_SYNC_PCLK);
+
+                s3c2410_dma_devconfig(prtd->params->channel,
+                                        S3C2410_DMASRC_HW, 0x3,
+                                        prtd->params->dma_addr);
+        }
+
         /* flush the DMA channel */
         s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
         prtd->dma_loaded = 0;