--- drivers/media/dvb/frontends/rtl2832.c.orig	2012-05-17 20:38:39.916496007 +0200
+++ drivers/media/dvb/frontends/rtl2832.c	2012-05-18 00:27:02.571804702 +0200
@@ -26,7 +26,7 @@
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
 
-static int reg_mask[32] = {
+static const reg_mask[32] = {
 	0x00000001,
 	0x00000003,
 	0x00000007,
@@ -61,7 +61,7 @@
 	0xffffffff
 };
 
-struct rtl2832_reg_entry registers[] = {
+static const struct rtl2832_reg_entry registers[] = {
 	[DVBT_SOFT_RST]		= {0x1, 0x1,   2, 2},
 	[DVBT_IIC_REPEAT]	= {0x1, 0x1,   3, 3},
 	[DVBT_TR_WAIT_MIN_8K]	= {0x1, 0x88, 11, 2},
@@ -317,7 +317,7 @@
 	page = registers[reg].page;
 
 	len = (msb >> 3) + 1;
-	mask = reg_mask[msb-lsb];
+	mask = reg_mask[msb - lsb];
 
 
 	ret = rtl2832_rd_regs(priv, reg_start_addr, page, &reading[0], len);
@@ -326,7 +326,7 @@
 
 	reading_tmp = 0;
 	for (i = 0; i < len; i++)
-		reading_tmp |= reading[i] << ((len-1-i)*8);
+		reading_tmp |= reading[i] << ((len - 1 - i) * 8);
 
 	*val = (reading_tmp >> lsb) & mask;
 
@@ -360,7 +360,7 @@
 	page = registers[reg].page;
 
 	len = (msb >> 3) + 1;
-	mask = reg_mask[msb-lsb];
+	mask = reg_mask[msb - lsb];
 
 
 	ret = rtl2832_rd_regs(priv, reg_start_addr, page, &reading[0], len);
@@ -369,14 +369,14 @@
 
 	reading_tmp = 0;
 	for (i = 0; i < len; i++)
-		reading_tmp |= reading[i] << ((len-1-i)*8);
+		reading_tmp |= reading[i] << ((len - 1 - i) * 8);
 
 	writing_tmp = reading_tmp & ~(mask << lsb);
 	writing_tmp |= ((val & mask) << lsb);
 
 
 	for (i = 0; i < len; i++)
-		writing[i] = (writing_tmp >> ((len-1-i)*8)) & 0xff;
+		writing[i] = (writing_tmp >> ((len - 1 - i) * 8)) & 0xff;
 
 	ret = rtl2832_wr_regs(priv, reg_start_addr, page, &writing[0], len);
 	if (ret)
@@ -403,7 +403,6 @@
 		return 0;
 
 	ret = rtl2832_wr_demod_reg(priv, DVBT_IIC_REPEAT, (enable ? 0x1 : 0x0));
-
 	if (ret)
 		goto err;