diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp
index 76fe1a0..3bafdf4 100644
--- a/modules/camera/Camera.cpp
+++ b/modules/camera/Camera.cpp
@@ -301,7 +301,7 @@
     for (int i = 0; i < mNumStreams; i++)
         mStreams[i]->mReuse = false;
     // Fill new stream array with reused streams and new streams
-    for (int i = 0; i < stream_config->num_streams; i++) {
+    for (unsigned int i = 0; i < stream_config->num_streams; i++) {
         astream = stream_config->streams[i];
         if (astream->max_buffers > 0)
             newStreams[i] = reuseStream(astream);
@@ -533,13 +533,13 @@
         mSettings = clone_camera_metadata(new_settings);
 }
 
-bool Camera::isValidCaptureSettings(const camera_metadata_t *settings)
+bool Camera::isValidCaptureSettings(const camera_metadata_t* /*settings*/)
 {
     // TODO: reject settings that cannot be captured
     return true;
 }
 
-bool Camera::isValidReprocessSettings(const camera_metadata_t *settings)
+bool Camera::isValidReprocessSettings(const camera_metadata_t* /*settings*/)
 {
     // TODO: reject settings that cannot be reprocessed
     // input buffers unimplemented, use this to reject reprocessing requests
diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp
index 0d8164c..dfbbe4c 100644
--- a/modules/camera/CameraHAL.cpp
+++ b/modules/camera/CameraHAL.cpp
@@ -92,6 +92,10 @@
     char *nameEnd;
 
     ALOGV("%s: module=%p, name=%s, device=%p", __func__, mod, name, dev);
+    if (*name == '\0') {
+        ALOGE("%s: Invalid camera id name is NULL", __func__);
+        return -EINVAL;
+    }
     id = strtol(name, &nameEnd, 10);
     if (*nameEnd != '\0') {
         ALOGE("%s: Invalid camera id name %s", __func__, name);