git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zr364xx.c
diff --git
a/drivers/media/video/zr364xx.c
b/drivers/media/video/zr364xx.c
index
ac169c9
..
fc976f4
100644
(file)
--- a/
drivers/media/video/zr364xx.c
+++ b/
drivers/media/video/zr364xx.c
@@
-882,9
+882,11
@@
static void zr364xx_disconnect(struct usb_interface *intf)
video_unregister_device(cam->vdev);
cam->vdev = NULL;
kfree(cam->buffer);
- if (cam->framebuf)
- vfree(cam->framebuf);
+ cam->buffer = NULL;
+ vfree(cam->framebuf);
+ cam->framebuf = NULL;
kfree(cam);
+ cam = NULL;
}