Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 0c3eea9..5116900 100755 (executable)
--- a/src/device.c
+++ b/src/device.c
@@ -233,8 +233,6 @@ static gboolean device_pending_reset(gpointer user_data)
        DBG("device %p", device);
 
 #if defined TIZEN_EXT
-       DBusMessage *reply;
-
        /* Power request timed out, send ETIMEDOUT. */
        if (device->pending_reply_list) {
                g_list_foreach(device->pending_reply_list, __device_pending_reset, NULL);
@@ -300,11 +298,11 @@ int __connman_device_enable(struct connman_device *device)
        }
        /*
         * if err == -EINPROGRESS, then the DBus call to the respective daemon
-        * was successful. We set a 10 sec timeout so if the daemon never
+        * was successful. We set a 4 sec timeout so if the daemon never
         * returns a reply, we would reset the pending request.
         */
        if (err == -EINPROGRESS)
-               device->pending_timeout = g_timeout_add_seconds(10,
+               device->pending_timeout = g_timeout_add_seconds(4,
                                        device_pending_reset, device);
 done:
        return err;