---

yaml --- r: 353479 b: refs/heads/master c: 4a8b89f h: refs/heads/master i: 353477: 261010c 353475: 64a5e57 353471: cb8f757 v: v3
git-mirror · Feb 12, 2013 · ce7f183 · ce7f183
1 parent 6ad2e82
commit ce7f183
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);