summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVineet Uprari <v.uprari@samsung.com>2013-09-13 15:18:31 +0530
committerVineet Uprari <v.uprari@samsung.com>2013-09-16 10:42:23 +0530
commit26125a353ea1e09bccc4193d9168aaef230a72cf (patch)
treee9825fa5c4f7b74acde5747b40e3995a34663eb7
parente17885f65fdc41573e6755f442e3a5a951040627 (diff)
downloadhaptic-module-tizen-26125a353ea1e09bccc4193d9168aaef230a72cf.tar.gz
haptic-module-tizen-26125a353ea1e09bccc4193d9168aaef230a72cf.tar.bz2
haptic-module-tizen-26125a353ea1e09bccc4193d9168aaef230a72cf.zip
Fixed continuous vibration along with system hang.
Change-Id: I9afb037601cb814b74d91bbb28ee7337b59e4548
-rw-r--r--tizen/DEVICE/src/file.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tizen/DEVICE/src/file.c b/tizen/DEVICE/src/file.c
index b640e0c..1a6ae80 100644
--- a/tizen/DEVICE/src/file.c
+++ b/tizen/DEVICE/src/file.c
@@ -121,7 +121,7 @@ static int _cancel_thread(void)
usleep(100);
MODULE_LOG("Already locked..");
}
- __haptic_predefine_action(gbuffer.handle, STOP, NULL);
+
pthread_mutex_unlock(&mutex);
if ((ret = pthread_cancel(tid)) < 0) {
@@ -163,6 +163,11 @@ static void __clean_up(void *arg)
pbuffer->channels = 0;
pbuffer->length = 0;
+
+ if(stop){
+ __haptic_predefine_action(gbuffer.handle, STOP, NULL);
+ pthread_mutex_unlock(&mutex);
+ }
}
static void* __play_cb(void *arg)
@@ -182,7 +187,6 @@ static void* __play_cb(void *arg)
for (k = 0; k < pbuffer->channels; ++k) {
pthread_mutex_lock(&mutex);
if (stop) {
- pthread_mutex_unlock(&mutex);
pthread_exit((void*)0);
}
ch = pbuffer->ppbuffer[k][j];