diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-13 18:15:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:55:55 -0400 |
commit | 51b6d717fb8e261e9705d66351f425561f114d4b (patch) | |
tree | 1ab5e396af54f713e21e187dc8423a1db298be90 /drivers | |
parent | bca3ba7904426bb94ee1a91e6e88831483fb5d53 (diff) |
[media] tm6000: remove a check for NO_PCM_LOCK
This was likely used by some test. There's no sense on keeping it
upstream.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index 2b96047c2983..a588f299af49 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c | |||
@@ -254,9 +254,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size) | |||
254 | memcpy(runtime->dma_area + buf_pos * stride, buf, | 254 | memcpy(runtime->dma_area + buf_pos * stride, buf, |
255 | length * stride); | 255 | length * stride); |
256 | 256 | ||
257 | #ifndef NO_PCM_LOCK | ||
258 | snd_pcm_stream_lock(substream); | 257 | snd_pcm_stream_lock(substream); |
259 | #endif | ||
260 | 258 | ||
261 | chip->buf_pos += length; | 259 | chip->buf_pos += length; |
262 | if (chip->buf_pos >= runtime->buffer_size) | 260 | if (chip->buf_pos >= runtime->buffer_size) |
@@ -268,9 +266,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size) | |||
268 | period_elapsed = 1; | 266 | period_elapsed = 1; |
269 | } | 267 | } |
270 | 268 | ||
271 | #ifndef NO_PCM_LOCK | ||
272 | snd_pcm_stream_unlock(substream); | 269 | snd_pcm_stream_unlock(substream); |
273 | #endif | ||
274 | 270 | ||
275 | if (period_elapsed) | 271 | if (period_elapsed) |
276 | snd_pcm_period_elapsed(substream); | 272 | snd_pcm_period_elapsed(substream); |