vserver 2.0 rc7

[linux-2.6.git] / drivers / usb / media / usbvideo.c

diff --git a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c
index 543d465..24efb21 100644 (file)
--- a/drivers/usb/media/usbvideo.c
+++ b/drivers/usb/media/usbvideo.c
@@ -1169,10 +1169,8 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
                        }
                        RingQueue_Free(&uvd->dp);
                        for (i=0; i < USBVIDEO_NUMSBUF; i++) {
-                               if (uvd->sbuf[i].data != NULL) {
-                                       kfree (uvd->sbuf[i].data);
-                                       uvd->sbuf[i].data = NULL;
-                               }
+                               kfree(uvd->sbuf[i].data);
+                               uvd->sbuf[i].data = NULL;
                        }
                }
        }
@@ -1814,12 +1812,12 @@ static void usbvideo_StopDataPump(struct uvd *uvd)
 {
        int i, j;
 
-       if (uvd->debug > 1)
-               info("%s($%p)", __FUNCTION__, uvd);
-
        if ((uvd == NULL) || (!uvd->streaming) || (uvd->dev == NULL))
                return;
 
+       if (uvd->debug > 1)
+               info("%s($%p)", __FUNCTION__, uvd);
+
        /* Unschedule all of the iso td's */
        for (i=0; i < USBVIDEO_NUMSBUF; i++) {
                usb_kill_urb(uvd->sbuf[i].urb);