From f9cbd82121e71a306eaf063ccfc3ec223fd128fe Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 29 Sep 2012 03:12:53 -0300
Subject: [PATCH] --- yaml --- r: 333847 b: refs/heads/master c:
 546196addefb2e25810964c41ce2186eba8cad4b h: refs/heads/master i:   333845:
 b9ccf679ce57309bf89a63003d4e45e20400ffe3   333843:
 bac2e447ba2dcdd5f0647dc4668c73e1eb6332c5   333839:
 3a2c77dcc6e154a0c911dc8d40715a00189426db v: v3

---
 [refs]                                                       | 2 +-
 trunk/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c | 2 +-
 trunk/drivers/media/pci/cx25821/cx25821-video-upstream.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e26ea6547d8e..9c517b192696 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78ef81f6ea9649fd09d1fafcfa0ad68763172c42
+refs/heads/master: 546196addefb2e25810964c41ce2186eba8cad4b
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/trunk/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index c8c94fbf5d8d..d33fc1a23030 100644
--- a/trunk/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/trunk/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
@@ -761,7 +761,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
 	}
 
 	/* Default if filename is empty string */
-	if (strcmp(dev->input_filename_ch2, "") == 0) {
+	if (strcmp(dev->_filename_ch2, "") == 0) {
 		if (dev->_isNTSC_ch2) {
 			dev->_filename_ch2 = (dev->_pixel_format_ch2 ==
 				PIXEL_FRMT_411) ? "/root/vid411.yuv" :
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-video-upstream.c b/trunk/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 52c13e0b6492..6759fff8eb64 100644
--- a/trunk/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/trunk/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -808,7 +808,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
 	}
 
 	/* Default if filename is empty string */
-	if (strcmp(dev->input_filename, "") == 0) {
+	if (strcmp(dev->_filename, "") == 0) {
 		if (dev->_isNTSC) {
 			dev->_filename =
 				(dev->_pixel_format == PIXEL_FRMT_411) ?