diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index e3f394c..7d6754b 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -899,7 +899,11 @@
 
     params.setPreviewFrameRate(mFrameRate);
     String8 s = params.flatten();
-    CHECK_EQ(OK, mCamera->setParameters(s));
+    if (OK != mCamera->setParameters(s)) {
+        LOGE("Could not change settings."
+             " Someone else is using camera %d?", mCameraId);
+        return -EBUSY;
+    }
     CameraParameters newCameraParams(mCamera->getParameters());
 
     // Check on video frame size
@@ -921,6 +925,8 @@
              "frame rate is %d", mFrameRate, frameRate);
     }
 
+    // This CHECK is good, since we just passed the lock/unlock
+    // check earlier by calling mCamera->setParameters().
     CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));
     IPCThreadState::self()->restoreCallingIdentity(token);
     return OK;