mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 01:24:12 +08:00
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>
This commit is contained in:
parent
a8c006aafe
commit
d1600401fa
@ -857,7 +857,7 @@ static int chipio_write_address(struct hda_codec *codec,
|
||||
chip_addx >> 16);
|
||||
}
|
||||
|
||||
spec->curr_chip_addx = (res < 0) ? ~0UL : chip_addx;
|
||||
spec->curr_chip_addx = (res < 0) ? ~0U : chip_addx;
|
||||
|
||||
return res;
|
||||
}
|
||||
@ -882,7 +882,7 @@ static int chipio_write_data(struct hda_codec *codec, unsigned int data)
|
||||
/*If no error encountered, automatically increment the address
|
||||
as per chip behaviour*/
|
||||
spec->curr_chip_addx = (res != -EIO) ?
|
||||
(spec->curr_chip_addx + 4) : ~0UL;
|
||||
(spec->curr_chip_addx + 4) : ~0U;
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -933,7 +933,7 @@ static int chipio_read_data(struct hda_codec *codec, unsigned int *data)
|
||||
/*If no error encountered, automatically increment the address
|
||||
as per chip behaviour*/
|
||||
spec->curr_chip_addx = (res != -EIO) ?
|
||||
(spec->curr_chip_addx + 4) : ~0UL;
|
||||
(spec->curr_chip_addx + 4) : ~0U;
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user