12 files changed, 26 insertions, 45 deletions

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 34a837a1abf4..b3c9d7327ac1 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1331,9 +1331,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
 {
         /* check if the ASIC is there */
         if (dst_probe(state) < 0) {
-                if (state)
-                        kfree(state);
-
+                kfree(state);
                 return NULL;
         }
         /* determine settings based on type */
@@ -1349,9 +1347,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
                 break;
         default:
                 dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
-                if (state)
-                        kfree(state);
-
+                kfree(state);
                 return NULL;
         }
 
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index 794be520d590..645946a992d9 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -148,7 +148,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
         return &state->frontend;
 
 error:
-        if (state) kfree(state);
+        kfree(state);
         return NULL;
 }
 
@@ -171,7 +171,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
         return &state->frontend;
 
 error:
-        if (state) kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index faaad1ae8559..19b4bf7c21a7 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -559,7 +559,8 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
         return &state->frontend;
 
 error:
-        if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e);  /* restore reg 0x3e */
+        if (reg0x3e >= 0)
+                l64781_writereg (state, 0x3e, reg0x3e);  /* restore reg 0x3e */
         kfree(state);
         return NULL;
 }
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 8dde72bd1046..7852b83b82d4 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -731,8 +731,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         dprintk("%s: ERROR\n",__FUNCTION__);
         return NULL;
 }
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index e38454901dd1..9c67f406d581 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -677,8 +677,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 817b044c7fd1..fc74c40d6477 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -577,8 +577,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 87fd3a7bb392..0823ddaf7004 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -865,10 +865,8 @@ out_dev:
 
 out_irq:
 #endif
-        for (i = 0; i < MAX_AR_HEIGHT; i++) {
-                if (ar->frame[i])
-                        kfree(ar->frame[i]);
-        }
+        for (i = 0; i < MAX_AR_HEIGHT; i++)
+                kfree(ar->frame[i]);
 
 out_line_buff:
 #if USE_INT
@@ -899,10 +897,8 @@ static void __exit ar_cleanup_module(void)
 #if USE_INT
         free_irq(M32R_IRQ_INT3, ar);
 #endif
-        for (i = 0; i < MAX_AR_HEIGHT; i++) {
-                if (ar->frame[i])
-                        kfree(ar->frame[i]);
-        }
+        for (i = 0; i < MAX_AR_HEIGHT; i++)
+                kfree(ar->frame[i]);
 #if USE_INT
         kfree(ar->line_buff);
 #endif
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index c062a017491e..d538a994ff04 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -1951,8 +1951,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
         }
 
         down(&fh->cap.lock);
-        if (fh->ov.clips)
-                kfree(fh->ov.clips);
+        kfree(fh->ov.clips);
         fh->ov.clips    = clips;
         fh->ov.nclips   = n;
 
@@ -2723,8 +2722,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         fh->ov.w.height = fb->fmt.height;
                         btv->init.ov.w.width  = fb->fmt.width;
                         btv->init.ov.w.height = fb->fmt.height;
-                        if (fh->ov.clips)
-                                kfree(fh->ov.clips);
+                        kfree(fh->ov.clips);
                         fh->ov.clips = NULL;
                         fh->ov.nclips = 0;
 
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 59bb71381a1b..d679ca23ded7 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 break;
         }
 
-        if (cap2)
-                kfree(cap2);
-        if (fmt2)
-                kfree(fmt2);
+        kfree(cap2);
+        kfree(fmt2);
         return err;
 }
 
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index c9d5f1a873cc..839db622040d 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -353,8 +353,7 @@ videocodec_build_table (void)
         dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i,
                 size);
 
-        if (videocodec_buf)
-                kfree(videocodec_buf);
+        kfree(videocodec_buf);
         videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
 
         i = 0;
@@ -471,8 +470,7 @@ videocodec_exit (void)
 {
 #ifdef CONFIG_PROC_FS
         remove_proc_entry("videocodecs", NULL);
-        if (videocodec_buf)
-                kfree(videocodec_buf);
+        kfree(videocodec_buf);
 #endif
 }
 
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 06df15f75de9..83c49f9610d0 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -215,8 +215,7 @@ video_usercopy(struct inode *inode, struct file *file,
         }
 
 out:
-        if (mbuf)
-                kfree(mbuf);
+        kfree(mbuf);
         return err;
 }
 
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index eed2acea1779..39a0d238900e 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -1057,10 +1057,8 @@ zr36057_init (struct zoran *zr)
                         KERN_ERR
                         "%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
                         ZR_DEVNAME(zr));
-                if (vdev)
-                        kfree(vdev);
-                if (mem)
-                        kfree((void *)mem);
+                kfree(vdev);
+                kfree((void *)mem);
                 return -ENOMEM;
         }
         memset((void *) mem, 0, mem_needed);
@@ -1105,15 +1103,15 @@ zoran_release (struct zoran *zr)
         /* unregister videocodec bus */
         if (zr->codec) {
                 struct videocodec_master *master = zr->codec->master_data;
+
                 videocodec_detach(zr->codec);
-                if (master)
-                        kfree(master);
+                kfree(master);
         }
         if (zr->vfe) {
                 struct videocodec_master *master = zr->vfe->master_data;
+
                 videocodec_detach(zr->vfe);
-                if (master)
-                        kfree(master);
+                kfree(master);
         }
 
         /* unregister i2c bus */