From ce7f183b6d5b6482d19b4e146f9fb993e5803273 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 12 Feb 2013 10:15:15 +0100 Subject: [PATCH] --- yaml --- r: 353479 b: refs/heads/master c: 4a8b89f99534af1deaae73679797c27e77661ef0 h: refs/heads/master i: 353477: 261010cf0b8a821646bb5274172da3ff3eb120b6 353475: 64a5e57bb910e67d67f90709c7225a2d1b6418f8 353471: cb8f75778e2c9f8d01ec853d8450c995ff12b592 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/ca0132_regs.h | 2 +- trunk/sound/pci/hda/patch_ca0132.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3d50abed2bd2..51ced68c3b56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d911149625e64ec3cbc92725a2c2c5d940b62ffb +refs/heads/master: 4a8b89f99534af1deaae73679797c27e77661ef0 diff --git a/trunk/sound/pci/hda/ca0132_regs.h b/trunk/sound/pci/hda/ca0132_regs.h index 831ca9c47992..07e760937d3c 100644 --- a/trunk/sound/pci/hda/ca0132_regs.h +++ b/trunk/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/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index b1e099a3369c..fe07664b44b6 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/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);