]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] cx25821: testing the wrong variable
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 29 Sep 2012 06:12:53 +0000 (03:12 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 7 Oct 2012 12:50:24 +0000 (09:50 -0300)
->input_filename could be NULL here.  The intent was to test
->_filename.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
drivers/media/pci/cx25821/cx25821-video-upstream.c

index c8c94fbf5d8d2c68382e2edd3901b93fb1be340d..d33fc1a2303087ccb416ed158708c31c9ddec4d3 100644 (file)
@@ -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" :
index 52c13e0b6492c601400d3e999cd747307beba271..6759fff8eb640b57b4b9048bb48f3ef0dfa777c8 100644 (file)
@@ -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) ?