diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-02-12 04:15:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-02-12 04:15:15 -0500 |
commit | 4a8b89f99534af1deaae73679797c27e77661ef0 (patch) | |
tree | c7662e6ce9da05086ad478e1f5828e9246e733b8 /sound/pci/hda/patch_ca0132.c | |
parent | d911149625e64ec3cbc92725a2c2c5d940b62ffb (diff) |
ALSA: hda/ca0132 - Fix type of INVALID_CHIP_ADDRESS
The chip address is 32bit long but INVALID_CHIP_ADDRESS is defined as
an unsigned long. This makes dsp_chip_to_dsp_addx() misbehaving on
64bit architectures. Fix the INVALID_CHIP_ADDRESS definition to be
32bit.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_ca0132.c')
-rw-r--r-- | sound/pci/hda/patch_ca0132.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index b1e099a3369c..fe07664b44b6 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c | |||
@@ -1598,7 +1598,7 @@ static unsigned int dsp_chip_to_dsp_addx(unsigned int chip_addx, | |||
1598 | return Y_OFF(chip_addx); | 1598 | return Y_OFF(chip_addx); |
1599 | } | 1599 | } |
1600 | 1600 | ||
1601 | return (unsigned int)INVALID_CHIP_ADDRESS; | 1601 | return INVALID_CHIP_ADDRESS; |
1602 | } | 1602 | } |
1603 | 1603 | ||
1604 | /* | 1604 | /* |
@@ -4540,7 +4540,7 @@ static int ca0132_init(struct hda_codec *codec) | |||
4540 | int i; | 4540 | int i; |
4541 | 4541 | ||
4542 | spec->dsp_state = DSP_DOWNLOAD_INIT; | 4542 | spec->dsp_state = DSP_DOWNLOAD_INIT; |
4543 | spec->curr_chip_addx = (unsigned int)INVALID_CHIP_ADDRESS; | 4543 | spec->curr_chip_addx = INVALID_CHIP_ADDRESS; |
4544 | 4544 | ||
4545 | snd_hda_power_up(codec); | 4545 | snd_hda_power_up(codec); |
4546 | 4546 | ||