Skip to content

Commit

Permalink
V4L/DVB (4865): Fix: Slot 0 not NULL on disconnecting SN9C10x PC Camera
Browse files Browse the repository at this point in the history 
The patch fix bug 5748.

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Luca Risolia authored and Mauro Carvalho Chehab committed Nov 26, 2006
1 parent a5bbc7d commit 5718bbd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/media/video/et61x251/et61x251_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,6 @@ static void et61x251_release_resources(struct et61x251_device* cam)
video_set_drvdata(cam->v4ldev, NULL);
video_unregister_device(cam->v4ldev);

usb_put_dev(cam->usbdev);

mutex_unlock(&et61x251_sysfs_lock);

kfree(cam->control_buffer);
Expand Down Expand Up @@ -1275,6 +1273,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)

if (cam->state & DEV_DISCONNECTED) {
et61x251_release_resources(cam);
usb_put_dev(cam->usbdev);
mutex_unlock(&cam->dev_mutex);
kfree(cam);
return 0;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/video/sn9c102/sn9c102_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1462,8 +1462,6 @@ static void sn9c102_release_resources(struct sn9c102_device* cam)
video_set_drvdata(cam->v4ldev, NULL);
video_unregister_device(cam->v4ldev);

usb_put_dev(cam->usbdev);

mutex_unlock(&sn9c102_sysfs_lock);

kfree(cam->control_buffer);
Expand Down Expand Up @@ -1555,6 +1553,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)

if (cam->state & DEV_DISCONNECTED) {
sn9c102_release_resources(cam);
usb_put_dev(cam->usbdev);
mutex_unlock(&cam->dev_mutex);
kfree(cam);
return 0;
Expand Down

0 comments on commit 5718bbd

Please sign in to comment.