From patchwork Thu Aug 15 12:23:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1810 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 353B660E2D for ; Thu, 15 Aug 2019 14:23:39 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B45572AF for ; Thu, 15 Aug 2019 14:23:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1565871818; bh=iv0rf0HRBOFv8EwwGcGPezFz0t7QYmxJ/VXPit81sQI=; h=From:To:Subject:Date:From; b=PLZRR/kjgtE55XbqqWWgiK01A/iqhVzUK+Hq8to8jSwvgy+Z3hACM6VCowbBioVmE +1YFnTPGw4BCeov6rHWYUJZ70GE8ayG5mVJu54lYdsbB/304halz3ev8+Q/mT8yMh3 voPI+DN7fJVH2p4duRfpuG6CfRIk5JAzlOffpdUI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 15 Aug 2019 15:23:32 +0300 Message-Id: <20190815122332.13717-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] hal: Fix comparison of unsigned integer < 0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2019 12:23:39 -0000 The CameraHalManager::getCameraInfo() validates the camera id it receives from the camera service, and in doing so generates a compiler error 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 Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- src/android/camera_hal_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 1e66f63240da..37ba01355258 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; }