Merge pull request #49 from vinodkoul/fixes

Allow setting of single byte control and make error from percent_to_int more consistent.

1 files changed, 8 insertions, 7 deletions

diff --git a/mixer.c b/mixer.c
index b6c854f..9be8623 100644
--- a/mixer.c
+++ b/mixer.c
@@ -259,14 +259,11 @@ unsigned int mixer_ctl_get_num_values(struct mixer_ctl *ctl)
 
 static int percent_to_int(struct snd_ctl_elem_info *ei, int percent)
 {
-    int range;
-
-    if (percent > 100)
-        percent = 100;
-    else if (percent < 0)
-        percent = 0;
+    if ((percent > 100) || (percent < 0)) {
+        return -EINVAL;
+    }
 
-    range = (ei->value.integer.max - ei->value.integer.min);
+    int range = (ei->value.integer.max - ei->value.integer.min);
 
     return ei->value.integer.min + (range * percent) / 100;
 }
@@ -404,6 +401,10 @@ int mixer_ctl_set_value(struct mixer_ctl *ctl, unsigned int id, int value)
         ev.value.enumerated.item[id] = value;
         break;
 
+    case SNDRV_CTL_ELEM_TYPE_BYTES:
+        ev.value.bytes.data[id] = value;
+        break;
+
     default:
         return -EINVAL;
     }