Skip to content

Commit

Permalink
ALSA: hda/ca0132 - Fix type of INVALID_CHIP_ADDRESS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Feb 12, 2013
1 parent d911149 commit 4a8b89f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sound/pci/hda/ca0132_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/hda/patch_ca0132.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 4a8b89f

Please sign in to comment.