diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-17 04:23:07 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:55:35 +0900 |
| commit | 9365dc40ab42654232dbfefeeefcf03f53422420 (patch) | |
| tree | a6cbfcba2498b2a833add077f3d2673af30093b8 | |
| parent | 82ed1f1270f6935fd8f39be93f5dc430b2d4425b (diff) | |
| download | linux-3.10-9365dc40ab42654232dbfefeeefcf03f53422420.tar.gz linux-3.10-9365dc40ab42654232dbfefeeefcf03f53422420.tar.bz2 linux-3.10-9365dc40ab42654232dbfefeeefcf03f53422420.zip | |
upstream: [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>
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-empress.c | 24 |
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 07bd06ccc5f..393c9f18d12 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) |