diff options
| author | Tambet Ingo <tambet@gmail.com> | 2008-07-31 12:24:12 +0300 |
|---|---|---|
| committer | Tambet Ingo <tambet@gmail.com> | 2008-07-31 12:24:12 +0300 |
| commit | fa9c303d98cc933f0daa35f0e2182dd63f361d90 (patch) | |
| tree | 7dd63c835ef29d7dd1dcde206b4c5ceea3cb27ae /src/mm-serial.c | |
| parent | c7e8eacb1c7a974466729bec3726395e31d62c73 (diff) | |
Merge fixes from NetworkManager SVN.
Diffstat (limited to 'src/mm-serial.c')
| -rw-r--r-- | src/mm-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mm-serial.c b/src/mm-serial.c index a9f3f349..0f267a21 100644 --- a/src/mm-serial.c +++ b/src/mm-serial.c @@ -746,7 +746,7 @@ mm_serial_wait_for_reply (MMSerial *self, info->callback = callback; info->user_data = user_data; info->reply_index = -1; - info->timeout = timeout * 1000; + info->timeout = timeout; info->start = time (NULL); return mm_serial_set_pending (self, timeout, wait_for_reply_got_data, info, wait_for_reply_done); |