diff options
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/dma-sh7760.c | 3 | ||||
-rw-r--r-- | sound/soc/sh/ssi.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 0dad3a0bb920..baddb1242c71 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c | |||
@@ -103,7 +103,8 @@ static struct snd_pcm_hardware camelot_pcm_hardware = { | |||
103 | .info = (SNDRV_PCM_INFO_MMAP | | 103 | .info = (SNDRV_PCM_INFO_MMAP | |
104 | SNDRV_PCM_INFO_INTERLEAVED | | 104 | SNDRV_PCM_INFO_INTERLEAVED | |
105 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 105 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
106 | SNDRV_PCM_INFO_MMAP_VALID), | 106 | SNDRV_PCM_INFO_MMAP_VALID | |
107 | SNDRV_PCM_INFO_BATCH), | ||
107 | .formats = DMABRG_FMTS, | 108 | .formats = DMABRG_FMTS, |
108 | .rates = DMABRG_RATES, | 109 | .rates = DMABRG_RATES, |
109 | .rate_min = 8000, | 110 | .rate_min = 8000, |
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 56fa0872abbb..b378096cadb1 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -145,7 +145,7 @@ static int ssi_hw_params(struct snd_pcm_substream *substream, | |||
145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; | 145 | recv = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 0 : 1; |
146 | 146 | ||
147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); | 147 | pr_debug("ssi_hw_params() enter\nssicr was %08lx\n", ssicr); |
148 | pr_debug("bits: %d channels: %d\n", bits, channels); | 148 | pr_debug("bits: %u channels: %u\n", bits, channels); |
149 | 149 | ||
150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | | 150 | ssicr &= ~(CR_TRMD | CR_CHNL_MASK | CR_DWL_MASK | CR_PDTA | |
151 | CR_SWL_MASK); | 151 | CR_SWL_MASK); |