Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[~andy/linux] / drivers / staging / cx25821 / cx25821-video-upstream.c

diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
index 31b4e3c74c8d6d4e2512c0fbf454ef7238119b75..eb0172bf39d100dd56a3f380851bb9e29c7b8884 100644 (file)
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -279,13 +279,10 @@ void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
        dev->_frame_count = 0;
        dev->_file_status = END_OF_FILE;
 
-       if (dev->_irq_queues) {
-               kfree(dev->_irq_queues);
-               dev->_irq_queues = NULL;
-       }
+       kfree(dev->_irq_queues);
+       dev->_irq_queues = NULL;
 
-       if (dev->_filename != NULL)
-               kfree(dev->_filename);
+       kfree(dev->_filename);
 
        tmp = cx_read(VID_CH_MODE_SEL);
        cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);