At Mon, 11 Feb 2013 22:05:24 +0300, Dan Carpenter wrote: > > The error handling here won't work on 64 bit systems. > INVALID_CHIP_ADDRESS is an unsigned long defined like this: > > #define INVALID_CHIP_ADDRESS (~0UL) > > But we truncate the high bits away before returning and then we save it > in an unsigned 32bit and then we compare it against the unsigned long > version. > > I've changed everything to unsigned long. > > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Thanks for finding this. Actually the DSP address field seems 32bit long, so it's simply a wrong define for INVALID_CHIP_ADDRESS to use unsigned long. I fixed the definition instead in the patch below. Takashi --- From: Takashi Iwai <tiwai@xxxxxxx> Subject: [PATCH] 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@xxxxxxxxxx> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> --- sound/pci/hda/ca0132_regs.h | 2 +- sound/pci/hda/patch_ca0132.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/ca0132_regs.h b/sound/pci/hda/ca0132_regs.h index 831ca9c..07e7609 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 b1e099a..fe07664 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); -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
