diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-audio.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-audio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index 6296697d025f..0131322475bf 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c | |||
@@ -224,10 +224,12 @@ static int em28xx_cmd(struct em28xx *dev, int cmd, int arg) | |||
224 | 224 | ||
225 | switch (cmd) { | 225 | switch (cmd) { |
226 | case EM28XX_CAPTURE_STREAM_EN: | 226 | case EM28XX_CAPTURE_STREAM_EN: |
227 | if (dev->adev.capture_stream == STREAM_OFF && arg == EM28XX_START_AUDIO) { | 227 | if (dev->adev.capture_stream == STREAM_OFF && |
228 | arg == EM28XX_START_AUDIO) { | ||
228 | dev->adev.capture_stream = STREAM_ON; | 229 | dev->adev.capture_stream = STREAM_ON; |
229 | em28xx_init_audio_isoc(dev); | 230 | em28xx_init_audio_isoc(dev); |
230 | } else if (dev->adev.capture_stream == STREAM_ON && arg == EM28XX_STOP_AUDIO) { | 231 | } else if (dev->adev.capture_stream == STREAM_ON && |
232 | arg == EM28XX_STOP_AUDIO) { | ||
231 | dev->adev.capture_stream = STREAM_OFF; | 233 | dev->adev.capture_stream = STREAM_OFF; |
232 | em28xx_deinit_isoc_audio(dev); | 234 | em28xx_deinit_isoc_audio(dev); |
233 | } else { | 235 | } else { |
@@ -385,8 +387,8 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream, | |||
385 | struct em28xx *dev = snd_pcm_substream_chip(substream); | 387 | struct em28xx *dev = snd_pcm_substream_chip(substream); |
386 | int retval; | 388 | int retval; |
387 | 389 | ||
388 | dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START)? | 390 | dprintk("Should %s capture\n", (cmd == SNDRV_PCM_TRIGGER_START) ? |
389 | "start": "stop"); | 391 | "start" : "stop"); |
390 | 392 | ||
391 | spin_lock(&dev->adev.slock); | 393 | spin_lock(&dev->adev.slock); |
392 | switch (cmd) { | 394 | switch (cmd) { |