--- a/hardware/msm7k/libaudio-msm7x30/AudioHardware.cpp      2011-09-28 23:31:56.000000000 +0100
+++ b/hardware/msm7k/libaudio-msm7x30/AudioHardware.cpp   2011-10-24 20:50:36.000000000 +0100
@@ -346,8 +346,6 @@
                                  uint32_t rx_acdb_id, uint32_t tx_acdb_id ) {
     LOGD("updateDeviceInfo: E rx_device %d and tx_device %d", rx_device, tx_device);
     bool isRxDeviceEnabled = false, isTxDeviceEnabled = false;
-    Routing_table *temp_ptr, *temp_head;
-    temp_head = head;

     Mutex::Autolock lock(mDeviceSwitchLock);

@@ -368,6 +366,8 @@
         cur_tx = tx_device;
     }

+    Routing_table *temp_ptr, *temp_head;
+    temp_head = head;
     Mutex::Autolock lock_1(mRoutingTableLock);

     while (temp_head->next != NULL) {