summaryrefslogtreecommitdiff
path: root/src/libcamera/media_device.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcamera/media_device.cpp')
-rw-r--r--src/libcamera/media_device.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp
index aa93da75..ced19a10 100644
--- a/src/libcamera/media_device.cpp
+++ b/src/libcamera/media_device.cpp
@@ -63,8 +63,7 @@ LOG_DEFINE_CATEGORY(MediaDevice)
* populate() before the media graph can be queried.
*/
MediaDevice::MediaDevice(const std::string &deviceNode)
- : deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false),
- lockOwner_(false)
+ : deviceNode_(deviceNode), fd_(-1), valid_(false), acquired_(false)
{
}
@@ -146,15 +145,9 @@ bool MediaDevice::lock()
if (fd_ == -1)
return false;
- /* Do not allow nested locking in the same libcamera instance. */
- if (lockOwner_)
- return false;
-
if (lockf(fd_, F_TLOCK, 0))
return false;
- lockOwner_ = true;
-
return true;
}
@@ -172,11 +165,6 @@ void MediaDevice::unlock()
if (fd_ == -1)
return;
- if (!lockOwner_)
- return;
-
- lockOwner_ = false;
-
lockf(fd_, F_ULOCK, 0);
}