Jiri Slaby wrote:

# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1191675980 -7200 # Node ID 210b62fbf40aba1dc223da3c47c2db4650dc0ac6 # Parent a39992015edfc30818c224d1886dc8311bc3106b v4l2_extension: proper v4l2ext_lock locking in v4l2ext_register

don't allow two releases of the lock on fail path

Signed-off-by: Jiri Slaby jirislaby@gmail.com

diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c @@ -575,7 +575,8 @@ int v4l2ext_register(struct video_device printk(KERN_ERR "This driver supports only %d device " "creations\n", V4L2EXT_MAXDEV); ret = -ENOSPC;

• goto out_unlock;
  

• mutex_unlock(&v4l2ext_lock);
  

• goto out;
  

  }

  /* reserve this entry */

@@ -661,10 +662,7 @@ int v4l2ext_register(struct video_device kfree(dev); kfree(fake_inode); kfree(dev->fake_file.f_dentry);

• out_unlock:
• mutex_unlock(&v4l2ext_lock);

+out: return ret; }

Patch committed at http://linuxtv.org/hg/~tmerle/v4l2_extension/

Thierry