summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-12 14:02:06 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-15 15:40:14 +0300
commita8b472598ebc7874651a92f6342c714c37b0f083 (patch)
treee5281266285ffa27b7239638929dedbbe8125113 /src
parent0268984c0d870a6e772b45e3aa1b01daadd45395 (diff)
hal: Fix comparison of unsigned integer < 0
The CameraHalManager::getCameraInfo() validates the camera id it receives from the camera service, and in doing so generates a compiler error with gcc as the id is an unsigned integer and can never be negative: ../src/android/camera_hal_manager.cpp: In member function ‘CameraProxy* CameraHalManager::open(unsigned int, const hw_module_t*)’: ../src/android/camera_hal_manager.cpp:89:9: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits] if (id < 0 || id >= numCameras()) { Fix it by removing the unneeded comparison. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
-rw-r--r--src/android/camera_hal_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index 1e66f632..37ba0135 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -86,7 +86,7 @@ void CameraHalManager::run()
CameraProxy *CameraHalManager::open(unsigned int id,
const hw_module_t *hardwareModule)
{
- if (id < 0 || id >= numCameras()) {
+ if (id >= numCameras()) {
LOG(HAL, Error) << "Invalid camera id '" << id << "'";
return nullptr;
}