---

yaml --- r: 333847 b: refs/heads/master c: 546196a h: refs/heads/master i: 333845: b9ccf67 333843: bac2e44 333839: 3a2c77d v: v3
git-mirror · Oct 7, 2012 · f9cbd82 · f9cbd82
1 parent 5f35e4b
commit f9cbd82
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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) ?