summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Kim <dojip.kim@lge.com>2014-08-26 22:45:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-26 22:45:56 +0000
commit21371a06c8ab730b56276e7dc6aa768c59e13db3 (patch)
treeee00046545ac6b4c788bcdcb56a29befe10f60ef
parent5f939e27e27f26d630c1cf8b5873bf8128161000 (diff)
parent3c6fa1114f34347d27b6b46dec1f3940bd50ed11 (diff)
downloadandroid_hardware_broadcom_libbt-21371a06c8ab730b56276e7dc6aa768c59e13db3.tar.gz
android_hardware_broadcom_libbt-21371a06c8ab730b56276e7dc6aa768c59e13db3.tar.bz2
android_hardware_broadcom_libbt-21371a06c8ab730b56276e7dc6aa768c59e13db3.zip
am 3c6fa111: am 822e4da8: Do not set timer if PROC_BTWRITE_TIMER_TIMEOUT_MS == 0
* commit '3c6fa1114f34347d27b6b46dec1f3940bd50ed11': Do not set timer if PROC_BTWRITE_TIMER_TIMEOUT_MS == 0
-rw-r--r--src/upio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/upio.c b/src/upio.c
index 75c4ecb..c996865 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -372,6 +372,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
ALOGE("upio_set : write(%s) failed: %s (%d)",
VENDOR_LPM_PROC_NODE, strerror(errno),errno);
}
+#if (PROC_BTWRITE_TIMER_TIMEOUT_MS != 0)
else
{
if (action == UPIO_ASSERT)
@@ -395,6 +396,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
}
}
}
+#endif
if (fd >= 0)
close(fd);
@@ -458,6 +460,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
ALOGE("upio_set : write(%s) failed: %s (%d)",
VENDOR_BTWRITE_PROC_NODE, strerror(errno),errno);
}
+#if (PROC_BTWRITE_TIMER_TIMEOUT_MS != 0)
else
{
lpm_proc_cb.btwrite_active = TRUE;
@@ -474,6 +477,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
timer_settime(lpm_proc_cb.timer_id, 0, &ts, 0);
}
}
+#endif
UPIODBG("proc btwrite assertion");