On Wed, Feb 13, 2002 at 05:55:30PM -0800, Greg KH wrote:
> [EMAIL PROTECTED], 2002-02-13 17:18:52-08:00, [EMAIL PROTECTED]
>   usb vicam driver:
>       - fix for memory leak.
> 
>  drivers/usb/vicam.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletion(-)


# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#                  ChangeSet    1.333   -> 1.334  
#        drivers/usb/vicam.c    1.6     -> 1.7    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/02/13      [EMAIL PROTECTED]       1.334
# usb vicam driver:
#       - fix for memory leak.
# --------------------------------------------
#
diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
--- a/drivers/usb/vicam.c       Wed Feb 13 17:51:09 2002
+++ b/drivers/usb/vicam.c       Wed Feb 13 17:51:09 2002
@@ -896,13 +896,18 @@
        vicam->win.contrast = 10;
 
        /* FIXME */
-       if (vicam_init(vicam))
+       if (vicam_init(vicam)) {
+               usb_free_urb(vicam->readurb);
+               kfree(vicam);
                return NULL;
+       }
        memcpy(&vicam->vdev, &vicam_template, sizeof(vicam_template));
        memcpy(vicam->vdev.name, vicam->camera_name, strlen(vicam->camera_name));
        
        if (video_register_device(&vicam->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                err("video_register_device");
+               usb_free_urb(vicam->readurb);
+               kfree(vicam);
                return NULL;
        }
 

_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to