kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda/ca0132 - Fix type of INVALID_CHIP_ADDRESS

Browse source 
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>
This commit is contained in:
Takashi Iwai 2013-02-12 10:15:15 +01:00
parent d911149625
commit 4a8b89f995
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/pci/hda/ca0132_regs.h
View file

@ -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)

4
sound/pci/hda/patch_ca0132.c
View file

@ -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);