Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 400b7083 authored by Peter Beutner's avatar Peter Beutner Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3194): Revert one 64-bit fix and improved other 64-bit fixes 



- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.

Signed-off-by: default avatarPeter Beutner <p.beutner@gmx.net>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent d8e6acf2

drivers/media/common/saa7146_hlp.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int 


	int b_depth = vv->ov_fmt->depth;

	int b_bpl = vv->ov_fb.fmt.bytesperline;

	u32 base = (u32)(unsigned long)vv->ov_fb.base;

	u32 base = (u32)vv->ov_fb.base;



	struct	saa7146_video_dma vdma1;

drivers/media/dvb/dvb-core/dvb_frontend.c

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct dvb_frontend_private { 
	unsigned int exit;

	unsigned int wakeup;

	fe_status_t status;

	unsigned int tune_mode_flags;

	unsigned long tune_mode_flags;

	unsigned int delay;



	/* swzigzag values */
@@ -808,13 +808,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, 
			 * initialization, so parg is 8 bits and does not

			 * include the initialization or start bit

			 */

			unsigned int cmd = ((unsigned long) parg) << 1;

			unsigned long cmd = ((unsigned long) parg) << 1;

			struct timeval nexttime;

			struct timeval tv[10];

			int i;

			u8 last = 1;

			if (dvb_frontend_debug)

				printk("%s switch command: 0x%04x\n", __FUNCTION__, cmd);

				printk("%s switch command: 0x%04lx\n", __FUNCTION__, cmd);

			do_gettimeofday(&nexttime);

			if (dvb_frontend_debug)

				memcpy(&tv[0], &nexttime, sizeof(struct timeval));

drivers/media/dvb/dvb-core/dvb_frontend.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ struct dvb_frontend_ops { 
	int (*diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);

	int (*set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);

	int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);

	int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, int arg);

	int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd);

	int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);

	int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);

	int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);

};

drivers/media/dvb/dvb-core/dvb_net.c

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype) 
	return if_num;

}



static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)

static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned long num)

{

	struct net_device *net = dvbnet->device[num];

	struct dvb_net_priv *priv;

drivers/media/dvb/frontends/stv0299.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag 
	};

}



static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)

static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long cmd)

{

	struct stv0299_state* state = fe->demodulator_priv;

	u8 reg0x08;
@@ -414,7 +414,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) 


	cmd = cmd << 1;

	if (debug_legacy_dish_switch)

		printk ("%s switch command: 0x%04x\n",__FUNCTION__, cmd);

		printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd);



	do_gettimeofday (&nexttime);

	if (debug_legacy_dish_switch)