[alsa-cvslog] alsa-lib: ALSA library repository branch, master now at v1.0.25-15-ge8923f2

[<nor...@al...>]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  e8923f2e7569cc390129572bfbd6552cbb407207 (commit)
      from  e4d9c348304880399e622d99d0177f434a517d88 (commit)

- Log -----------------------------------------------------------------
commit e8923f2e7569cc390129572bfbd6552cbb407207
Author:     Arun Raghavan <aru...@co...>
AuthorDate: Wed May 23 18:16:33 2012 +0530
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Tue May 29 11:59:26 2012 +0200

    ucm: Handle repeat device and modifier enables/disables
    
    Currently, enabling a device twice can cause it to be added to
    snd_use_case_mgr_t->active_devices twice, causing the list to become a
    loop and subsequent uses to result in an infinite loop.
    
    This patch makes sure we don't enable/disable a device twice, and avoid
    doing the same for modifiers.
    
    Signed-off-by: Arun Raghavan <aru...@co...>
    Acked-by: Liam Girdwood <lr...@ti...>
    Signed-off-by: Takashi Iwai <ti...@su...>

-----------------------------------------------------------------------

Diffstat:
 src/ucm/main.c |   62 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 34 insertions(+), 28 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/src/ucm/main.c b/src/ucm/main.c
index 76ca151..79901f8 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -565,6 +565,34 @@ static struct use_case_modifier *
 	return NULL;
 }
 
+long device_status(snd_use_case_mgr_t *uc_mgr,
+                   const char *device_name)
+{
+        struct use_case_device *dev;
+        struct list_head *pos;
+
+        list_for_each(pos, &uc_mgr->active_devices) {
+                dev = list_entry(pos, struct use_case_device, active_list);
+                if (strcmp(dev->name, device_name) == 0)
+                        return 1;
+        }
+        return 0;
+}
+
+long modifier_status(snd_use_case_mgr_t *uc_mgr,
+                     const char *modifier_name)
+{
+        struct use_case_modifier *mod;
+        struct list_head *pos;
+
+        list_for_each(pos, &uc_mgr->active_modifiers) {
+                mod = list_entry(pos, struct use_case_modifier, active_list);
+                if (strcmp(mod->name, modifier_name) == 0)
+                        return 1;
+        }
+        return 0;
+}
+
 /**
  * \brief Set verb
  * \param uc_mgr Use case manager
@@ -607,6 +635,9 @@ static int set_modifier(snd_use_case_mgr_t *uc_mgr,
 	struct list_head *seq;
 	int err;
 
+	if (modifier_status(uc_mgr, modifier->name) == enable)
+		return 0;
+
 	if (enable) {
 		seq = &modifier->enable_list;
 	} else {
@@ -638,6 +669,9 @@ static int set_device(snd_use_case_mgr_t *uc_mgr,
 	struct list_head *seq;
 	int err;
 
+        if (device_status(uc_mgr, device->name) == enable)
+		return 0;
+
 	if (enable) {
 		seq = &device->enable_list;
 	} else {
@@ -1316,34 +1350,6 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr,
         return err;
 }
 
-long device_status(snd_use_case_mgr_t *uc_mgr,
-                   const char *device_name)
-{
-        struct use_case_device *dev;
-        struct list_head *pos;
-        
-        list_for_each(pos, &uc_mgr->active_devices) {
-                dev = list_entry(pos, struct use_case_device, active_list);
-                if (strcmp(dev->name, device_name) == 0)
-                        return 1;
-        }
-        return 0;
-}
-
-long modifier_status(snd_use_case_mgr_t *uc_mgr,
-                     const char *modifier_name)
-{
-        struct use_case_modifier *mod;
-        struct list_head *pos;
-        
-        list_for_each(pos, &uc_mgr->active_modifiers) {
-                mod = list_entry(pos, struct use_case_modifier, active_list);
-                if (strcmp(mod->name, modifier_name) == 0)
-                        return 1;
-        }
-        return 0;
-}
-
 
 /**
  * \brief Get current - integer
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  e4d9c348304880399e622d99d0177f434a517d88 \
  e8923f2e7569cc390129572bfbd6552cbb407207