Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 546196ad authored Sep 29, 2012 by Dan Carpenter Committed by Mauro Carvalho Chehab Oct 07, 2012

[media] cx25821: testing the wrong variable



->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>

parent 78ef81f6

drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" :

drivers/media/pci/cx25821/cx25821-video-upstream.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) ?