tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "camera: avoid narrowing of the ioctl request"

Browse source
This commit is contained in:
Ari Hausman-Cohen 2018-10-12 00:45:21 +00:00 committed by Gerrit Code Review
commit eef57caed9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/camera/3_4/v4l2_wrapper.cpp
View file

@ -129,7 +129,7 @@ void V4L2Wrapper::Disconnect() {
// 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_);

2
modules/camera/3_4/v4l2_wrapper.h
View file

@ -99,7 +99,7 @@ class V4L2Wrapper {
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);