Compilation fixesstaging/cm-14.1-cafrebasecm-14.1_old

Change-Id: Ifc2c33d5f9c4c4f94511ba46ab3208a874968221

2 files changed, 4 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index 8af70d2..578baf4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@ LOCAL_SRC_FILES:= tinyplay.c
 LOCAL_MODULE := tinyplay
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror -Wno-missing-field-initializers
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
@@ -53,7 +53,7 @@ LOCAL_SRC_FILES:= tinyplay.c
 LOCAL_MODULE := tinyplay
 LOCAL_STATIC_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror -Wno-missing-field-initializers
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
@@ -67,7 +67,7 @@ LOCAL_SRC_FILES:= tinycap.c
 LOCAL_MODULE := tinycap
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror -Wno-missing-field-initializers
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
diff --git a/mixer.c b/mixer.c
index 8593b90..a02c790 100644
--- a/mixer.c
+++ b/mixer.c
@@ -428,7 +428,7 @@ int mixer_ctl_set_value(struct mixer_ctl *ctl, unsigned int id, int value)
     }
 
     case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
-        if (value < 0 || value >= mixer_ctl_get_num_enums(ctl))
+        if (value < 0 || (value >= 0 && (unsigned int)value >= mixer_ctl_get_num_enums(ctl)))
             return -EINVAL;
         ev.value.enumerated.item[id] = value;
         break;