[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL

[linux-2.6-omap-h63xx.git] / drivers / usb / media / ov511.c

diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
index 0fd7ffed3a980155c3514cd1da68246995e298fd..d6051822416e0a4601828e41545125fe25f9819b 100644 (file)
--- a/drivers/usb/media/ov511.c
+++ b/drivers/usb/media/ov511.c
@@ -3915,10 +3915,8 @@ ov51x_do_dealloc(struct usb_ov511 *ov)
        ov->tempfbuf = NULL;
 
        for (i = 0; i < OV511_NUMSBUF; i++) {
-               if (ov->sbuf[i].data) {
-                       kfree(ov->sbuf[i].data);
-                       ov->sbuf[i].data = NULL;
-               }
+               kfree(ov->sbuf[i].data);
+               ov->sbuf[i].data = NULL;
        }
 
        for (i = 0; i < OV511_NUMFRAMES; i++) {
@@ -5954,10 +5952,8 @@ error:
                up(&ov->cbuf_lock);
        }
 
-       if (ov) {
-               kfree(ov);
-               ov = NULL;
-       }
+       kfree(ov);
+       ov = NULL;
 
 error_out:
        err("Camera initialization failed");