CC: Jaroslav Kysela <perex@xxxxxxxx>
CC: Takashi Iwai <tiwai@xxxxxxxx>
CC: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
CC: "Hans P. Möller Ebner" <hmoller@xxxxx>
CC: Kees Cook <keescook@xxxxxxxxxxxx>
CC: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: "Fabián Inostroza" <soulsonceonfire@xxxxxxxxx>
CC: Bhumika Goyal <bhumirks@xxxxxxxxx>
CC: Philippe Ombredanne <pombredanne@xxxxxxxx>
CC: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
CC: alsa-devel@xxxxxxxxxxxxxxxx
CC: linux-kernel@xxxxxxxxxxxxxxx
This patch adds newlines after variable declarations in sound/usb/line6.
Signed-off-by: Roman Sommer <roman.sommer@xxxxxx>
Signed-off-by: Daniel Graefe <daniel.graefe@xxxxxx>
---
sound/usb/line6/driver.h | 1 +
sound/usb/line6/playback.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 1dfb6de..4dff70c 100644
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -174,6 +174,7 @@ struct usb_line6 {
struct mutex read_lock;
wait_queue_head_t wait_queue;
unsigned int active:1;
+
STRUCT_KFIFO_REC_2(LINE6_BUFSIZE_LISTEN * LINE6_RAW_MESSAGES_MAXCOUNT)
fifo;
} messages;
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 674502c..1e16a5c 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -39,6 +39,7 @@ static void change_volume(struct urb *urb_out, int volume[],
for (; p < buf_end; ++p) {
short pv = le16_to_cpu(*p);
int val = (pv * volume[chn & 1]) >> 8;
+
pv = clamp(val, -0x8000, 0x7fff);
*p = cpu_to_le16(pv);
++chn;
@@ -126,6 +127,7 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal,
short pov = le16_to_cpu(*po);
short piv = le16_to_cpu(*pi);
int val = pov + ((piv * volume) >> 8);
+
pov = clamp(val, -0x8000, 0x7fff);
*po = cpu_to_le16(pov);
}
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
