58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From: Stefan Hajnoczi <stefanha@gmail.com>
|
|
Date: Sun, 11 Nov 2012 13:24:39 +0100
|
|
Subject: [044/106] staging: line6: wrap >80 char lines in capture.c
|
|
|
|
commit a71cac2a4c502b2ef6715b1576681834f9dbe693 upstream.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/capture.c | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
|
|
index c85c5b6..389c41f 100644
|
|
--- a/drivers/staging/line6/capture.c
|
|
+++ b/drivers/staging/line6/capture.c
|
|
@@ -256,8 +256,8 @@ static void audio_in_callback(struct urb *urb)
|
|
#ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
|
|
if (!(line6pcm->flags & LINE6_BITS_PCM_IMPULSE))
|
|
#endif
|
|
- if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM, &line6pcm->flags)
|
|
- && (fsize > 0))
|
|
+ if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM,
|
|
+ &line6pcm->flags) && (fsize > 0))
|
|
line6_capture_copy(line6pcm, fbuf, fsize);
|
|
}
|
|
|
|
@@ -274,7 +274,8 @@ static void audio_in_callback(struct urb *urb)
|
|
#ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
|
|
if (!(line6pcm->flags & LINE6_BITS_PCM_IMPULSE))
|
|
#endif
|
|
- if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM, &line6pcm->flags))
|
|
+ if (test_bit(LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM,
|
|
+ &line6pcm->flags))
|
|
line6_capture_check_period(line6pcm, length);
|
|
}
|
|
}
|
|
@@ -356,7 +357,8 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd)
|
|
#ifdef CONFIG_PM
|
|
case SNDRV_PCM_TRIGGER_RESUME:
|
|
#endif
|
|
- err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
|
|
+ err = line6_pcm_acquire(line6pcm,
|
|
+ LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
@@ -367,7 +369,8 @@ int snd_line6_capture_trigger(struct snd_line6_pcm *line6pcm, int cmd)
|
|
#ifdef CONFIG_PM
|
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
#endif
|
|
- err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
|
|
+ err = line6_pcm_release(line6pcm,
|
|
+ LINE6_BIT_PCM_ALSA_CAPTURE_STREAM);
|
|
|
|
if (err < 0)
|
|
return err;
|