diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index d25ccfc..ceaf27d 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1127,7 +1127,7 @@
         mChannelCount(0),
         mFrameSize(1), mFormat(AUDIO_FORMAT_INVALID),
         mParamStatus(NO_ERROR),
-        mStandby(false), mDevice(device), mId(id),
+        mStandby(false), mDevice((audio_devices_t) device), mId(id),
         mDeathRecipient(new PMDeathRecipient(this))
 {
 }
@@ -3447,7 +3447,7 @@
 
             // forward device change to effects that have requested to be
             // aware of attached audio device.
-            mDevice = value;
+            mDevice = (audio_devices_t) value;
             for (size_t i = 0; i < mEffectChains.size(); i++) {
                 mEffectChains[i]->setDevice_l(mDevice);
             }
@@ -6474,7 +6474,7 @@
             // store input device and output device but do not forward output device to audio HAL.
             // Note that status is ignored by the caller for output device
             // (see AudioFlinger::setParameters()
-            audio_devices_t newDevice = mDevice;
+            uint32_t /*audio_devices_t*/ newDevice = mDevice;
             if (value & AUDIO_DEVICE_OUT_ALL) {
                 newDevice &= (uint32_t)~(value & AUDIO_DEVICE_OUT_ALL);
                 status = BAD_VALUE;
@@ -6489,7 +6489,7 @@
                 }
             }
             newDevice |= value;
-            mDevice = newDevice;    // since mDevice is read by other threads, only write to it once
+            mDevice = (audio_devices_t) newDevice;    // since mDevice is read by other threads, only write to it once
         }
         if (status == NO_ERROR) {
             status = mInput->stream->common.set_parameters(&mInput->stream->common, keyValuePair.string());