aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-12 10:15:15 +0100
committerTakashi Iwai <tiwai@suse.de>2013-02-12 10:15:15 +0100
commit4a8b89f99534af1deaae73679797c27e77661ef0 (patch)
treec7662e6ce9da05086ad478e1f5828e9246e733b8 /sound
parentd911149625e64ec3cbc92725a2c2c5d940b62ffb (diff)
downloadlinaro-lsk-4a8b89f99534af1deaae73679797c27e77661ef0.tar.gz
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')
-rw-r--r--sound/pci/hda/ca0132_regs.h2
-rw-r--r--sound/pci/hda/patch_ca0132.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/ca0132_regs.h b/sound/pci/hda/ca0132_regs.h
index 831ca9c4799..07e760937d3 100644
--- a/sound/pci/hda/ca0132_regs.h
+++ b/sound/pci/hda/ca0132_regs.h
@@ -337,7 +337,7 @@
#define DSPDMAC_ACTIVE_WFR_MASK 0xFFF000
#define DSP_AUX_MEM_BASE 0xE000
-#define INVALID_CHIP_ADDRESS (~0UL)
+#define INVALID_CHIP_ADDRESS (~0U)
#define X_SIZE (XRAM_XRAM_CHANNEL_COUNT * XRAM_XRAM_CHAN_INCR)
#define Y_SIZE (YRAM_YRAM_CHANNEL_COUNT * YRAM_YRAM_CHAN_INCR)
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index b1e099a3369..fe07664b44b 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,
return Y_OFF(chip_addx);
}
- return (unsigned int)INVALID_CHIP_ADDRESS;
+ return INVALID_CHIP_ADDRESS;
}
/*
@@ -4540,7 +4540,7 @@ static int ca0132_init(struct hda_codec *codec)
int i;
spec->dsp_state = DSP_DOWNLOAD_INIT;
- spec->curr_chip_addx = (unsigned int)INVALID_CHIP_ADDRESS;
+ spec->curr_chip_addx = INVALID_CHIP_ADDRESS;
snd_hda_power_up(codec);