diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:09:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:09:56 -0400 |
| commit | 88e366217e8f75bd7eab64f4aa4ff9583070b0af (patch) | |
| tree | efa9d084f98749a35555afd9898b92d51d3755d2 /sound/drivers/dummy.c | |
| parent | a1cf64944f6f2ffe5ef30a0ee4d529db771f7db2 (diff) | |
| parent | 975f6b0c1b0efb66db455d2e76bacba06cc65541 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
go7007 - Add missing dependency on sound subsystem
ALSA: ps3: Add support for SPDIF/HDMI passthru
ps3: Add passthru support for non-audio streams
ps3: Add ps3av_audio_mute_analog()
ALSA: misc typo fixes
sound: add missing pcm kernel-doc
Diffstat (limited to 'sound/drivers/dummy.c')
| -rw-r--r-- | sound/drivers/dummy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index e5e749f3e0ef..73be7e14a603 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c | |||
| @@ -51,7 +51,7 @@ static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime) | |||
| 51 | if (err < 0) | 51 | if (err < 0) |
| 52 | return err; | 52 | return err; |
| 53 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX); | 53 | err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX); |
| 54 | if (err) < 0) | 54 | if (err < 0) |
| 55 | return err; | 55 | return err; |
| 56 | return 0; | 56 | return 0; |
| 57 | } | 57 | } |