Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157917
b: refs/heads/master
c: eedbdf0
h: refs/heads/master
i:
  157915: 502e1c6
v: v3
  • Loading branch information
Takashi Iwai committed Jun 17, 2009
1 parent 84711e8 commit bdfe4ae
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b8e1c73f4608b8b9ca1e8f1a09f9fd8684e78071
refs/heads/master: eedbdf03a25ab3b2c332ad7fa205aa8ffbe477ba
9 changes: 9 additions & 0 deletions trunk/sound/usb/usbmixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,15 @@ static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
*/
scale[2] = (convert_signed_value(cval, cval->min) * 100) / 256;
scale[3] = (convert_signed_value(cval, cval->max) * 100) / 256;
if (scale[3] <= scale[2]) {
/* something is wrong; assume it's either from/to 0dB */
if (scale[2] < 0)
scale[3] = 0;
else if (scale[2] > 0)
scale[2] = 0;
else /* totally crap, return an error */
return -EINVAL;
}
if (copy_to_user(_tlv, scale, sizeof(scale)))
return -EFAULT;
return 0;
Expand Down

0 comments on commit bdfe4ae

Please sign in to comment.