more 64bit compile time warning fixes

2 files changed, 21 insertions, 20 deletions

diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index e0ec6fd23..f3868ead7 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -747,7 +747,7 @@ int stv0299_get_symbolrate (struct dvb_i2c_bus *i2c)
 static
 int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 {
-        int tuner_type = (int)fe->data;
+        int tuner_type = (long) fe->data;
 	struct dvb_i2c_bus *i2c = fe->i2c;
 
 	switch (cmd) {
@@ -883,18 +883,19 @@ int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 }
 
 static
-int probe_tuner (struct dvb_i2c_bus *i2c)
+long probe_tuner (struct dvb_i2c_bus *i2c)
 {
         /* read the status register of TSA5059 */
 	u8 rpt[] = { 0x05, 0xb5 };
         u8 stat [] = { 0 };
+	u8 tda6100_buf [] = { 0, 0 };
 	int ret;
 	struct i2c_msg msg1 [] = {{ addr: 0x68, flags: 0, buf: rpt,  len: 2 },
                            { addr: 0x60, flags: I2C_M_RD, buf: stat, len: 1 }};
 	struct i2c_msg msg2 [] = {{ addr: 0x68, flags: 0, buf: rpt,  len: 2 },
                            { addr: 0x61, flags: I2C_M_RD, buf: stat, len: 1 }};
 	struct i2c_msg msg3 [] = {{ addr: 0x68, flags: 0, buf: rpt,  len: 2 },
-				  { addr: 0x60, flags: 0, buf: stat, len: 1 }};
+			   { addr: 0x60, flags: 0, buf: tda6100_buf, len: 2 }};
 
 	stv0299_writereg (i2c, 0x01, 0x15);
 	stv0299_writereg (i2c, 0x02, 0x30);
@@ -938,7 +939,7 @@ int probe_tuner (struct dvb_i2c_bus *i2c)
 static
 int uni0299_attach (struct dvb_i2c_bus *i2c)
 {
-        int tuner_type;
+        long tuner_type;
 	u8 id = stv0299_readreg (i2c, 0x00);
 
 	dprintk ("%s: id == 0x%02x\n", __FUNCTION__, id);
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index 24223d583..f9f1ced87 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -43,29 +43,29 @@
  */
 
 #define SET_PWM(data,pwm) do { 		\
-	(int) data &= ~0xff; 		\
-	(int) data |= pwm; 		\
+	(long) data &= ~0xff; 		\
+	(long) data |= pwm; 		\
 } while (0)
 
 #define SET_REG0(data,reg0) do {	\
-	(int) data &= ~(0xff << 8); 	\
-	(int) data |= reg0 << 8; 	\
+	(long) data &= ~(0xff << 8); 	\
+	(long) data |= reg0 << 8; 	\
 } while (0)
 
 #define SET_TUNER(data,type) do {	\
-	(int) data &= ~(0xff << 16); 	\
-	(int) data |= type << 16;	\
+	(long) data &= ~(0xff << 16); 	\
+	(long) data |= type << 16;	\
 } while (0)
 
 #define SET_DEMOD_ADDR(data,type) do {	\
-	(int) data &= ~(0xff << 24); 	\
-	(int) data |= type << 24;	\
+	(long) data &= ~(0xff << 24); 	\
+	(long) data |= type << 24;	\
 } while (0)
 
-#define GET_PWM(data) ((u8) ((int) data & 0xff))
-#define GET_REG0(data) ((u8) (((int) data >> 8) & 0xff))
-#define GET_TUNER(data) ((u8) (((int) data >> 16) & 0xff))
-#define GET_DEMOD_ADDR(data) ((u8) (((int) data >> 24) & 0xff))
+#define GET_PWM(data) ((u8) ((long) data & 0xff))
+#define GET_REG0(data) ((u8) (((long) data >> 8) & 0xff))
+#define GET_TUNER(data) ((u8) (((long) data >> 16) & 0xff))
+#define GET_DEMOD_ADDR(data) ((u8) (((long) data >> 24) & 0xff))
 
 #define XIN 57840000UL
 #define FIN (XIN >> 4)
@@ -435,7 +435,7 @@ int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 
 
 static
-int probe_tuner (struct dvb_i2c_bus *i2c)
+long probe_tuner (struct dvb_i2c_bus *i2c)
 {
 	static const
 	struct i2c_msg msg1 = { addr: 0x61, flags: 0, buf: NULL, len: 0 };
@@ -480,7 +480,7 @@ u8 read_pwm (struct dvb_i2c_bus *i2c)
 
 
 static
-int probe_demod_addr (struct dvb_i2c_bus *i2c)
+long probe_demod_addr (struct dvb_i2c_bus *i2c)
 {
 	u8 b [] = { 0x00, 0x1a };
 	u8 id;
@@ -503,8 +503,8 @@ static
 int ves1820_attach (struct dvb_i2c_bus *i2c)
 {
 	void *data = NULL;
-	int demod_addr;
-	int tuner_type;
+	long demod_addr;
+	long tuner_type;
 
 	if ((demod_addr = probe_demod_addr(i2c)) < 0)
 		return -ENODEV;