summaryrefslogtreecommitdiff
path: root/drivers/staging/line6/playback.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-09-21 23:58:00 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-21 23:58:00 (GMT)
commit027360c5644b59d99db30e3515a8ec72350207b9 (patch)
tree2d5f307fec534fc6e76135121e4c1f8f517d6922 /drivers/staging/line6/playback.c
parent79be7254ebd2fb6d5f91b4b8e5d12cfe4fd7ecd7 (diff)
downloadlinux-fsl-qoriq-027360c5644b59d99db30e3515a8ec72350207b9.tar.xz
Staging: line6: minor coding style cleanups
This fixes up all of the remaining coding style issues that make any sense to make in the line6 driver. Cc: Markus Grabner <grabner@icg.tugraz.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/playback.c')
-rw-r--r--drivers/staging/line6/playback.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index 39218d6..29940fd 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -165,9 +165,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
struct usb_iso_packet_descriptor *fout =
&urb_out->iso_frame_desc[i];
- if (line6pcm->flags & MASK_CAPTURE) {
+ if (line6pcm->flags & MASK_CAPTURE)
fsize = line6pcm->prev_fsize;
- }
if (fsize == 0) {
int n;
@@ -237,7 +236,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
#endif
}
- if ((line6pcm->pos_out += urb_frames) >= runtime->buffer_size)
+ line6pcm->pos_out += urb_frames;
+ if (line6pcm->pos_out >= runtime->buffer_size)
line6pcm->pos_out -= runtime->buffer_size;
} else {
memset(urb_out->transfer_buffer, 0,
@@ -418,8 +418,8 @@ static void audio_out_callback(struct urb *urb)
submit_audio_out_urb(line6pcm);
if (test_bit(BIT_PCM_ALSA_PLAYBACK, &line6pcm->flags)) {
- if ((line6pcm->bytes_out +=
- length) >= line6pcm->period_out) {
+ line6pcm->bytes_out += length;
+ if (line6pcm->bytes_out >= line6pcm->period_out) {
line6pcm->bytes_out %= line6pcm->period_out;
snd_pcm_period_elapsed(substream);
}