summaryrefslogtreecommitdiff
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-04-17 04:23:07 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-13 13:26:44 -0300
commit51aefd738b6b143010928c3b18939719fe5a8264 (patch)
tree47d7de80c1106d6a25ed5728a5be6f05d1e6881a /drivers/media/pci
parent15e64f0dde77660a6d84b87dc870055c06d6da85 (diff)
[media] saa7134: swap ts_init_encoder and ts_reset_encoder
This will make the next patch a bit easier to read. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/saa7134/saa7134-empress.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index 07bd06ccc5f5..393c9f18d12d 100644
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -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)