diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-11 09:57:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 11:36:18 -0200 |
| commit | 4ae18398008d9a7fdddc6beb2e0b85fcc9cf093d (patch) | |
| tree | 68b071f3dcf2e42970f24203e623869393f9beed /drivers/staging/tm6000 | |
| parent | 06f08e3a4d86e746f5e8e09030e6560e37386b7f (diff) | |
| download | kernel_samsung_smdk4412-4ae18398008d9a7fdddc6beb2e0b85fcc9cf093d.zip kernel_samsung_smdk4412-4ae18398008d9a7fdddc6beb2e0b85fcc9cf093d.tar.gz kernel_samsung_smdk4412-4ae18398008d9a7fdddc6beb2e0b85fcc9cf093d.tar.bz2 | |
[media] tm6000: Use just one lock for devlist
This avoids a race condition
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-core.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index af41bbe..bfaaaa7 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -644,7 +644,6 @@ void tm6000_add_into_devlist(struct tm6000_core *dev) */ static LIST_HEAD(tm6000_extension_devlist); -static DEFINE_MUTEX(tm6000_extension_devlist_lock); int tm6000_call_fillbuf(struct tm6000_core *dev, enum tm6000_ops_type type, char *buf, int size) @@ -668,14 +667,12 @@ int tm6000_register_extension(struct tm6000_ops *ops) struct tm6000_core *dev = NULL; mutex_lock(&tm6000_devlist_mutex); - mutex_lock(&tm6000_extension_devlist_lock); list_add_tail(&ops->next, &tm6000_extension_devlist); list_for_each_entry(dev, &tm6000_devlist, devlist) { ops->init(dev); printk(KERN_INFO "%s: Initialized (%s) extension\n", dev->name, ops->name); } - mutex_unlock(&tm6000_extension_devlist_lock); mutex_unlock(&tm6000_devlist_mutex); return 0; } @@ -691,10 +688,8 @@ void tm6000_unregister_extension(struct tm6000_ops *ops) ops->fini(dev); } - mutex_lock(&tm6000_extension_devlist_lock); printk(KERN_INFO "tm6000: Remove (%s) extension\n", ops->name); list_del(&ops->next); - mutex_unlock(&tm6000_extension_devlist_lock); mutex_unlock(&tm6000_devlist_mutex); } EXPORT_SYMBOL(tm6000_unregister_extension); @@ -703,26 +698,26 @@ void tm6000_init_extension(struct tm6000_core *dev) { struct tm6000_ops *ops = NULL; - mutex_lock(&tm6000_extension_devlist_lock); + mutex_lock(&tm6000_devlist_mutex); if (!list_empty(&tm6000_extension_devlist)) { list_for_each_entry(ops, &tm6000_extension_devlist, next) { if (ops->init) ops->init(dev); } } - mutex_unlock(&tm6000_extension_devlist_lock); + mutex_unlock(&tm6000_devlist_mutex); } void tm6000_close_extension(struct tm6000_core *dev) { struct tm6000_ops *ops = NULL; - mutex_lock(&tm6000_extension_devlist_lock); + mutex_lock(&tm6000_devlist_mutex); if (!list_empty(&tm6000_extension_devlist)) { list_for_each_entry(ops, &tm6000_extension_devlist, next) { if (ops->fini) ops->fini(dev); } } - mutex_unlock(&tm6000_extension_devlist_lock); + mutex_lock(&tm6000_devlist_mutex); } |