Am 29.09.2012 09:12, schrieb Dan Carpenter:
> ->input_filename could be NULL here.  The intent was to test
> ->_filename.
> 
> Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
> ---
> I'm not totally convinced that using /root/vid411.yuv is the right idea.
> 
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c 
> b/drivers/media/pci/cx25821/cx25821-video-upstream.c
> index 52c13e0..6759fff 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
> +++ b/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) ?
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c 
> b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index c8c94fb..d33fc1a 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/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" :
>

In this case stcmp seems a bit of a overkill. A simple
*(dev->_filename_ch2) == 0
should be ok ?

re,
 wh
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to