alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling
PATCH 1/1 alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling
Current support for handling SND_CTL_TLVT_DB_RANGE in amixer is completely broken. This patch fixes it.
Reported-by Daniel Mack <[email protected]>
Signed-off-by Lars-Peter Clausen <[email protected]>
--- amixer/amixer.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
amixer/amixer.c +7 -7
@@ -517,20 +517,20 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_#ifdef SND_CTL_TLVT_DB_RANGE case SND_CTL_TLVT_DB_RANGE :printf ("dBrange-\n" ); -if ((size / (6 *sizeof (unsigned int ))) !=0 ) { +if ((size % (6 *sizeof (unsigned int ))) !=0 ) {while (size >0 ) {printf ("0x%08x," , tlv[idx++]); size -=sizeof (unsigned int ); }break ; } - idx =0 ; -while (idx < size) { +while (size >0 ) {print_spaces (spaces +2 ); -printf ("rangemin=%i," , tlv[0 ]); -printf (",rangemax=%i\n" , tlv[1 ]); -decode_tlv (spaces +4 , tlv +2 ,6 *sizeof (unsigned int )); - idx +=6 *sizeof (unsigned int ); +printf ("rangemin=%i," , tlv[idx++]); +printf (",rangemax=%i\n" , tlv[idx++]); +decode_tlv (spaces +4 , tlv + idx,4 *sizeof (unsigned int )); + idx +=4 ; + size -=6 *sizeof (unsigned int ); }break ;#endif
Signature · 1 line
1.7.2.5
Takashi Iwai
AppliedAt Thu, 16 Jun 2011 14:19:18 +0200,
Quoted 6 lines · Lars-Peter Clausen
Current support for handling
SND_CTL_TLVT_DB_RANGEin amixer is completely broken. This patch fixes it.Reported-by Daniel Mack <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>
Thanks, applied now.
Takashi
Quoted 39 lines
--- amixer/amixer.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)amixer/amixer.c +7
-7@@ -517,20 +517,20 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_#ifdef SND_CTL_TLVT_DB_RANGE case SND_CTL_TLVT_DB_RANGE :printf ("dBrange-\n" ); -if ((size / (6 *sizeof (unsigned int ))) !=0 ) { +if ((size % (6 *sizeof (unsigned int ))) !=0 ) {while (size >0 ) {printf ("0x%08x," , tlv[idx++]); size -=sizeof (unsigned int ); }break ; } - idx =0 ; -while (idx < size) { +while (size >0 ) {print_spaces (spaces +2 ); -printf ("rangemin=%i," , tlv[0 ]); -printf (",rangemax=%i\n" , tlv[1 ]); -decode_tlv (spaces +4 , tlv +2 ,6 *sizeof (unsigned int )); - idx +=6 *sizeof (unsigned int ); +printf ("rangemin=%i," , tlv[idx++]); +printf (",rangemax=%i\n" , tlv[idx++]); +decode_tlv (spaces +4 , tlv + idx,4 *sizeof (unsigned int )); + idx +=4 ; + size -=6 *sizeof (unsigned int ); }break ;#endif Signature · 1 line
1.7.2.5