| commit | 09a3af5e11b7da6ce94812e41f5307f340807468 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Dec 28 14:21:32 2017 -0800 |
| committer | Josh Gao <jmgao@google.com> | Thu Dec 28 14:21:32 2017 -0800 |
| tree | 984b2fdaae8b0db32a0a4f4efa1b15fe3bf9da04 | |
| parent | 0763ee2450949633bcb87b6729927095acb5f58a [diff] |
Don't TEMP_FAILURE_RETRY on close. close always succeeds, even if it was interrupted and "fails" with EINTR. Retrying will either close a nonexistent fd or stomp on another thread's newly opened file descriptor. Bug: http://b/20501816 Test: treehugger Change-Id: I706d5e8027e60b13f23f9488fdf5cf7cef7b3d3b
diff --git a/modules/camera/3_4/v4l2_camera_hal.cpp b/modules/camera/3_4/v4l2_camera_hal.cpp index bfc8712..83746ce 100644 --- a/modules/camera/3_4/v4l2_camera_hal.cpp +++ b/modules/camera/3_4/v4l2_camera_hal.cpp
@@ -103,7 +103,7 @@ } } } - TEMP_FAILURE_RETRY(close(fd)); + close(fd); } }