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

Commit 51aefd73 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: swap ts_init_encoder and ts_reset_encoder 



This will make the next patch a bit easier to read.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 15e64f0d

drivers/media/pci/saa7134/saa7134-empress.c

+13 −11
Original line number Diff line number Diff line
@@ -48,17 +48,7 @@ MODULE_PARM_DESC(debug,"enable debug messages"); 


/* ------------------------------------------------------------------ */



static void ts_reset_encoder(struct saa7134_dev* dev)

{

	if (!dev->empress_started)

		return;



	saa_writeb(SAA7134_SPECIAL_MODE, 0x00);

	msleep(10);

	saa_writeb(SAA7134_SPECIAL_MODE, 0x01);

	msleep(100);

	dev->empress_started = 0;

}

static void ts_reset_encoder(struct saa7134_dev* dev);



static int ts_init_encoder(struct saa7134_dev* dev)

{
@@ -79,6 +69,18 @@ static int ts_init_encoder(struct saa7134_dev* dev) 
	return 0;

}



static void ts_reset_encoder(struct saa7134_dev* dev)

{

	if (!dev->empress_started)

		return;



	saa_writeb(SAA7134_SPECIAL_MODE, 0x00);

	msleep(10);

	saa_writeb(SAA7134_SPECIAL_MODE, 0x01);

	msleep(100);

	dev->empress_started = 0;

}



/* ------------------------------------------------------------------ */



static int ts_open(struct file *file)