diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/core/pcm_native.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index fe5c8036beb..1a07750f383 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -460,7 +460,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, | |||
| 460 | PM_QOS_CPU_DMA_LATENCY, usecs); | 460 | PM_QOS_CPU_DMA_LATENCY, usecs); |
| 461 | return 0; | 461 | return 0; |
| 462 | _error: | 462 | _error: |
| 463 | /* hardware might be unuseable from this time, | 463 | /* hardware might be unusable from this time, |
| 464 | so we force application to retry to set | 464 | so we force application to retry to set |
| 465 | the correct hardware parameter settings */ | 465 | the correct hardware parameter settings */ |
| 466 | runtime->status->state = SNDRV_PCM_STATE_OPEN; | 466 | runtime->status->state = SNDRV_PCM_STATE_OPEN; |