aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-03-31 21:00:04 -0400
committerTakashi Iwai <tiwai@suse.de>2017-04-01 04:46:18 -0400
commitd1600401faad4bc186bfdb291d8af644465e20bd (patch)
tree01e746e697e6c25024e8f937e507f62cb22224f9
parenta8c006aafead3c45ae5d5601e3717055bccf41bc (diff)
ALSA: hda/ca0132: Limit values for chip addresses to 32-bit
With the previous unsigned long value clang generates warnings like this: sound/pci/hda/patch_ca0132.c:860:37: error: implicit conversion from 'unsigned long' to 'u32' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion] spec->curr_chip_addx = (res < 0) ? ~0UL : chip_addx; ~ ^~~~ Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_ca0132.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index fb2e242c2522..a148176c16a9 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -857,7 +857,7 @@ static int chipio_write_address(struct hda_codec *codec,
857 chip_addx >> 16); 857 chip_addx >> 16);
858 } 858 }
859 859
860 spec->curr_chip_addx = (res < 0) ? ~0UL : chip_addx; 860 spec->curr_chip_addx = (res < 0) ? ~0U : chip_addx;
861 861
862 return res; 862 return res;
863} 863}
@@ -882,7 +882,7 @@ static int chipio_write_data(struct hda_codec *codec, unsigned int data)
882 /*If no error encountered, automatically increment the address 882 /*If no error encountered, automatically increment the address
883 as per chip behaviour*/ 883 as per chip behaviour*/
884 spec->curr_chip_addx = (res != -EIO) ? 884 spec->curr_chip_addx = (res != -EIO) ?
885 (spec->curr_chip_addx + 4) : ~0UL; 885 (spec->curr_chip_addx + 4) : ~0U;
886 return res; 886 return res;
887} 887}
888 888
@@ -933,7 +933,7 @@ static int chipio_read_data(struct hda_codec *codec, unsigned int *data)
933 /*If no error encountered, automatically increment the address 933 /*If no error encountered, automatically increment the address
934 as per chip behaviour*/ 934 as per chip behaviour*/
935 spec->curr_chip_addx = (res != -EIO) ? 935 spec->curr_chip_addx = (res != -EIO) ?
936 (spec->curr_chip_addx + 4) : ~0UL; 936 (spec->curr_chip_addx + 4) : ~0U;
937 return res; 937 return res;
938} 938}
939 939