diff options
| author | Niraj Kumar Goit <niraj.g@samsung.com> | 2022-02-17 21:43:13 +0530 |
|---|---|---|
| committer | Niraj Kumar Goit <niraj.g@samsung.com> | 2022-02-23 21:00:32 +0530 |
| commit | bf0e619ef451bde3568c1af509ccb12cbda2ff93 (patch) | |
| tree | edc77ad122572a91f8ec267629fb1c4ffffabb4b /src/device.c | |
| parent | 2985b9822ac3f5acfef2933cbda98c1285e11af4 (diff) | |
| parent | f89b473dfd8e916314b534b3397442f8c869c783 (diff) | |
| download | connman-bf0e619ef451bde3568c1af509ccb12cbda2ff93.tar.gz connman-bf0e619ef451bde3568c1af509ccb12cbda2ff93.tar.bz2 connman-bf0e619ef451bde3568c1af509ccb12cbda2ff93.zip | |
Merge tag 'upstream/1.40' into tizen.submit/tizen/20220224.061208
Change-Id: I4ed89827d776db6eeec11878bc1cd0cd6c5e1e80
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
Signed-off-by: Anjali Nijhara <a.nijhara@samsung.com>
Diffstat (limited to 'src/device.c')
| -rwxr-xr-x | src/device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/device.c b/src/device.c index 0c3eea98..51169001 100755 --- 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; |