From 6f911718ba51b84ea34b45baf7f8b16954c33371 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Mon, 16 Aug 2010 11:16:41 +1000
Subject: Mutex is already locked when private member function is called.

Conflicts:

	src/plugins/bearer/icd/qicdengine.cpp
---
 src/plugins/bearer/icd/qicdengine.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index cae2b7c..3264f15 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -807,7 +807,6 @@ void QIcdEngine::getIcdInitialState()
      */
     Maemo::Icd icd;
     QList<Maemo::IcdStateResult> state_results;
-    QMutexLocker locker(&mutex);
     QNetworkConfigurationPrivatePointer ptr;
 
     if (icd.state(state_results) && !state_results.isEmpty()) {
@@ -825,9 +824,9 @@ void QIcdEngine::getIcdInitialState()
                     ptr->state = QNetworkConfiguration::Active;
                     configLocker.unlock();
 
-                    locker.unlock();
+                    mutex.unlock();
                     emit configurationChanged(ptr);
-                    locker.relock();
+                    mutex.lock();
                 }
                 break;
             default:
-- 
cgit v0.12