commit eef57caed9af7541d4cf8a8c694a808b5e039bf7
author Ari Hausman-Cohen <arihc@google.com> Fri Oct 12 00:45:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 00:45:21 2018 +0000
tree 2fe102824ea9871298fe25bc5918c28a9fb164da
parent c8096012179a66163720ba7373e7bdbf42862a58
parent 028763d9292a201f34fea501a20f484e8e0ed4fd

Merge "camera: avoid narrowing of the ioctl request"

modules/camera/3_4/v4l2_wrapper.cpp

diff --git a/modules/camera/3_4/v4l2_wrapper.cpp b/modules/camera/3_4/v4l2_wrapper.cpp
index 085683d..bba826f 100644
--- a/modules/camera/3_4/v4l2_wrapper.cpp
+++ b/modules/camera/3_4/v4l2_wrapper.cpp
@@ -129,7 +129,7 @@
 
 // Helper function. Should be used instead of ioctl throughout this class.
 template <typename T>
-int V4L2Wrapper::IoctlLocked(int request, T data) {
+int V4L2Wrapper::IoctlLocked(unsigned long request, T data) {
   // Potentially called so many times logging entry is a bad idea.
   std::lock_guard<std::mutex> lock(device_lock_);
 

modules/camera/3_4/v4l2_wrapper.h

diff --git a/modules/camera/3_4/v4l2_wrapper.h b/modules/camera/3_4/v4l2_wrapper.h
index 4a8d517..dcb8afe 100644
--- a/modules/camera/3_4/v4l2_wrapper.h
+++ b/modules/camera/3_4/v4l2_wrapper.h
@@ -99,7 +99,7 @@
   void Disconnect();
   // Perform an ioctl call in a thread-safe fashion.
   template <typename T>
-  int IoctlLocked(int request, T data);
+  int IoctlLocked(unsigned long request, T data);
   // Request/release userspace buffer mode via VIDIOC_REQBUFS.
   int RequestBuffers(uint32_t num_buffers);