diff --git a/daemon/src/audio/alsa/alsalayer.cpp b/daemon/src/audio/alsa/alsalayer.cpp
index 29cf9a088c4d6ff91cc0ac8bc14a0cc2c982e9a2..2d0054aab03a439c0f966877deb290de59a26f16 100644
--- a/daemon/src/audio/alsa/alsalayer.cpp
+++ b/daemon/src/audio/alsa/alsalayer.cpp
@@ -436,14 +436,12 @@ AlsaLayer::buildDeviceTopo(const std::string &plugin, int card)
 std::vector<std::string>
 AlsaLayer::getAudioDeviceList(AudioStreamDirection dir) const
 {
-    std::vector<HwIDPair> deviceMap;
-    std::vector<std::string> audioDeviceList;
-
-    deviceMap = getAudioDeviceIndexMap(dir);
+    std::vector<HwIDPair> deviceMap(getAudioDeviceIndexMap(dir));
 
-    for(std::vector<HwIDPair>::const_iterator iter = deviceMap.begin(); iter != deviceMap.end(); iter++) {
+    std::vector<std::string> audioDeviceList;
+    for (std::vector<HwIDPair>::const_iterator iter = deviceMap.begin();
+         iter != deviceMap.end(); ++iter)
          audioDeviceList.push_back(iter->second);
-    }
 
     return audioDeviceList;
 }