CC: Jaroslav Kysela <[email protected]> CC: Takashi Iwai <[email protected]> CC: Takashi Sakamoto <[email protected]> CC: "Hans P. Möller Ebner" <[email protected]> CC: Kees Cook <[email protected]> CC: Kate Stewart <[email protected]> CC: Thomas Gleixner <[email protected]> CC: "Fabián Inostroza" <[email protected]> CC: Bhumika Goyal <[email protected]> CC: Philippe Ombredanne <[email protected]> CC: Greg Kroah-Hartman <[email protected]> CC: [email protected] CC: [email protected]
This patch adds newlines after variable declarations in sound/usb/line6. Signed-off-by: Roman Sommer <[email protected]> Signed-off-by: Daniel Graefe <[email protected]> --- 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
