commit 60849b8da43c526bf988bf95a96f873420b94028
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 11 01:23:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 11 01:23:18 2017 +0000
tree d15732fa046fd727551e4c08e4ce2034ad861153
parent 879e1607d79631fad6150ce97d90b524f1b2f342
parent 4e8f561fcd8d51654b93b0ddaa22e5d7ca13f630

Merge "vibrator: fix issue with ledtrig-transient support"

modules/vibrator/vibrator.c

diff --git a/modules/vibrator/vibrator.c b/modules/vibrator/vibrator.c
index c3c2951..92c46e2 100644
--- a/modules/vibrator/vibrator.c
+++ b/modules/vibrator/vibrator.c
@@ -32,16 +32,20 @@
 
 static const char THE_DEVICE[] = "/sys/class/timed_output/vibrator/enable";
 
-static int vibra_exists() {
+static bool device_exists(const char *file) {
     int fd;
 
-    fd = TEMP_FAILURE_RETRY(open(THE_DEVICE, O_RDWR));
+    fd = TEMP_FAILURE_RETRY(open(file, O_RDWR));
     if(fd < 0) {
-        return 0;
+        return false;
     }
 
     close(fd);
-    return 1;
+    return true;
+}
+
+static bool vibra_exists() {
+    return device_exists(THE_DEVICE);
 }
 
 static int write_value(const char *file, const char *value)
@@ -102,9 +106,13 @@
     return write_value(file_str, value);
 }
 
-static int vibra_led_exists()
+static bool vibra_led_exists()
 {
-    return !write_led_file("trigger", "transient");
+    int fd;
+    char file_str[50];
+
+    snprintf(file_str, sizeof(file_str), "%s/%s", LED_DEVICE, "activate");
+    return device_exists(file_str);
 }
 
 static int vibra_led_on(vibrator_device_t* vibradev __unused, unsigned int timeout_ms)