From 3826705ccde9c8cee5539efe00db56e4fc6a14e4 Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Wed, 8 Jan 2014 19:39:30 +0900
Subject: [PATCH] No need for deferred in gracefullyKillWorker().

---
 lib/provider.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/provider.js b/lib/provider.js
index 20dd6448..f2ffc392 100644
--- a/lib/provider.js
+++ b/lib/provider.js
@@ -131,17 +131,14 @@ function forceKillWorker(id) {
 }
 
 function gracefullyKillWorker(id) {
-  var deferred = Q.defer()
-
-  tryKillWorker(id)
+  return tryKillWorker(id)
     .timeout(10000)
-    .then(deferred.resolve)
     .catch(function() {
       log.error('Device worker "%s" did not stop in time', id)
-      forceKillWorker(id).then(deferred.resolve)
+      return forceKillWorker(id)
+        .timeout(10000)
+        .then(deferred.resolve)
     })
-
-  return deferred.promise
 }
 
 function gracefullyExit() {