diff options
| author | Joe Perches <joe@perches.com> | 2014-10-27 01:25:07 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 03:40:18 -0400 |
| commit | ccbec5ea0dd7972d0c99ef8a143bb52c814509cf (patch) | |
| tree | 1c3eae4052c863efeefab5315862e33deffb66a4 | |
| parent | 7ce5c9268bacbe5ceca7849450c80e280aacd4c0 (diff) | |
ALSA: ad1889: Fix probable mask then right shift defects
Precedence of & and >> is not the same and is not left to right.
shift has higher precedence and should be done after the mask.
Add parentheses around the mask.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/ad1889.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 7bfdf9c51416..1610c38337af 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
| @@ -681,7 +681,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe | |||
| 681 | 681 | ||
| 682 | /* WARQ is at offset 12 */ | 682 | /* WARQ is at offset 12 */ |
| 683 | tmp = (reg & AD_DS_WSMC_WARQ) ? | 683 | tmp = (reg & AD_DS_WSMC_WARQ) ? |
| 684 | (((reg & AD_DS_WSMC_WARQ >> 12) & 0x01) ? 12 : 18) : 4; | 684 | ((((reg & AD_DS_WSMC_WARQ) >> 12) & 0x01) ? 12 : 18) : 4; |
| 685 | tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1; | 685 | tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1; |
| 686 | 686 | ||
| 687 | snd_iprintf(buffer, "Wave FIFO: %d %s words\n\n", tmp, | 687 | snd_iprintf(buffer, "Wave FIFO: %d %s words\n\n", tmp, |
| @@ -693,7 +693,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe | |||
| 693 | 693 | ||
| 694 | /* SYRQ is at offset 4 */ | 694 | /* SYRQ is at offset 4 */ |
| 695 | tmp = (reg & AD_DS_WSMC_SYRQ) ? | 695 | tmp = (reg & AD_DS_WSMC_SYRQ) ? |
| 696 | (((reg & AD_DS_WSMC_SYRQ >> 4) & 0x01) ? 12 : 18) : 4; | 696 | ((((reg & AD_DS_WSMC_SYRQ) >> 4) & 0x01) ? 12 : 18) : 4; |
| 697 | tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1; | 697 | tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1; |
| 698 | 698 | ||
| 699 | snd_iprintf(buffer, "Synthesis FIFO: %d %s words\n\n", tmp, | 699 | snd_iprintf(buffer, "Synthesis FIFO: %d %s words\n\n", tmp, |
| @@ -709,7 +709,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe | |||
| 709 | 709 | ||
| 710 | /* ACRQ is at offset 4 */ | 710 | /* ACRQ is at offset 4 */ |
| 711 | tmp = (reg & AD_DS_RAMC_ACRQ) ? | 711 | tmp = (reg & AD_DS_RAMC_ACRQ) ? |
| 712 | (((reg & AD_DS_RAMC_ACRQ >> 4) & 0x01) ? 12 : 18) : 4; | 712 | ((((reg & AD_DS_RAMC_ACRQ) >> 4) & 0x01) ? 12 : 18) : 4; |
| 713 | tmp /= (reg & AD_DS_RAMC_ADST) ? 2 : 1; | 713 | tmp /= (reg & AD_DS_RAMC_ADST) ? 2 : 1; |
| 714 | 714 | ||
| 715 | snd_iprintf(buffer, "ADC FIFO: %d %s words\n\n", tmp, | 715 | snd_iprintf(buffer, "ADC FIFO: %d %s words\n\n", tmp, |
| @@ -720,7 +720,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe | |||
| 720 | 720 | ||
| 721 | /* RERQ is at offset 12 */ | 721 | /* RERQ is at offset 12 */ |
| 722 | tmp = (reg & AD_DS_RAMC_RERQ) ? | 722 | tmp = (reg & AD_DS_RAMC_RERQ) ? |
| 723 | (((reg & AD_DS_RAMC_RERQ >> 12) & 0x01) ? 12 : 18) : 4; | 723 | ((((reg & AD_DS_RAMC_RERQ) >> 12) & 0x01) ? 12 : 18) : 4; |
| 724 | tmp /= (reg & AD_DS_RAMC_ADST) ? 2 : 1; | 724 | tmp /= (reg & AD_DS_RAMC_ADST) ? 2 : 1; |
| 725 | 725 | ||
| 726 | snd_iprintf(buffer, "Resampler FIFO: %d %s words\n\n", tmp, | 726 | snd_iprintf(buffer, "Resampler FIFO: %d %s words\n\n", tmp, |