summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-28 14:29:05 +0300
committerTakashi Iwai <tiwai@suse.de>2015-01-28 22:50:54 +0300
commit0416980d0a2bc10acff1c2329159577036e5666b (patch)
tree0344dfb49f4d4480c5b2d201af5267df0eaa4370 /sound/usb
parent247d95ee6dd22e5323ecf7a73ff64110ef2fa2da (diff)
downloadlinux-0416980d0a2bc10acff1c2329159577036e5666b.tar.xz
ALSA: line6: Fix volume calculation for big-endian
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/line6/playback.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 1708c05f14db..ae41124c351e 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -31,14 +31,16 @@ static void change_volume(struct urb *urb_out, int volume[],
return; /* maximum volume - no change */
if (bytes_per_frame == 4) {
- short *p, *buf_end;
+ __le16 *p, *buf_end;
- p = (short *)urb_out->transfer_buffer;
+ p = (__le16 *)urb_out->transfer_buffer;
buf_end = p + urb_out->transfer_buffer_length / sizeof(*p);
for (; p < buf_end; ++p) {
- int val = (*p * volume[chn & 1]) >> 8;
- *p = clamp(val, 0x7fff, -0x8000);
+ short pv = le16_to_cpu(*p);
+ int val = (pv * volume[chn & 1]) >> 8;
+ pv = clamp(val, 0x7fff, -0x8000);
+ *p = cpu_to_le16(pv);
++chn;
}
} else if (bytes_per_frame == 6) {
@@ -114,15 +116,18 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal,
return; /* zero volume - no change */
if (bytes_per_frame == 4) {
- short *pi, *po, *buf_end;
+ __le16 *pi, *po, *buf_end;
- pi = (short *)signal;
- po = (short *)urb_out->transfer_buffer;
+ pi = (__le16 *)signal;
+ po = (__le16 *)urb_out->transfer_buffer;
buf_end = po + urb_out->transfer_buffer_length / sizeof(*po);
for (; po < buf_end; ++pi, ++po) {
- int val = *po + ((*pi * volume) >> 8);
- *po = clamp(val, 0x7fff, -0x8000);
+ short pov = le16_to_cpu(*po);
+ short piv = le16_to_cpu(*pi);
+ int val = pov + ((piv * volume) >> 8);
+ pov = clamp(val, 0x7fff, -0x8000);
+ *po = cpu_to_le16(pov);
}
}