summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorChris Rankin <rankincj@yahoo.com>2011-09-04 15:38:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-18 07:58:01 -0300
commit16e3d2f4fab6e001a79705fa273418afc10188f8 (patch)
treec3d3ae94639e5c7c6f65394aeaeb55c2340ccc02 /drivers/media/video/em28xx
parent7577911244c437f4a4abac5e4b67b059c06dbe9d (diff)
downloadlinux-16e3d2f4fab6e001a79705fa273418afc10188f8.tar.gz
linux-16e3d2f4fab6e001a79705fa273418afc10188f8.tar.bz2
linux-16e3d2f4fab6e001a79705fa273418afc10188f8.zip
[media] EM28xx - Fix memory leak on disconnect or error
Release the dev->alt_max_pkt_size buffer in all cases. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c1
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 5fddcd0869de..013e946bdc45 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -3201,6 +3201,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
retval = em28xx_init_dev(&dev, udev, interface, nr);
if (retval) {
mutex_unlock(&dev->lock);
+ kfree(dev->alt_max_pkt_size);
kfree(dev);
goto err;
}
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index d176dc0394e2..61f35c8d66d2 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2200,6 +2200,7 @@ static int em28xx_v4l2_close(struct file *filp)
free the remaining resources */
if (dev->state & DEV_DISCONNECTED) {
em28xx_release_resources(dev);
+ kfree(dev->alt_max_pkt_size);
kfree(dev);
return 0;
}