diff mbox

[zbar,4/5] Ignore ENOTTY errors when calling VIDIOC_S_CROP

Message ID 1547422709-7111-4-git-send-email-james.hilliard1@gmail.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

James Hilliard Jan. 13, 2019, 11:38 p.m. UTC 
  From: James Hilliard <james.hilliard1@gmail.com>

Silences this error:
ERROR: zbar video in v4l2_reset_crop():
    system error: setting default crop window (VIDIOC_S_CROP): Inappropriate ioctl for device (25)

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 zbar/video/v4l2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
index 1d685e9..ad6adf4 100644
--- a/zbar/video/v4l2.c
+++ b/zbar/video/v4l2.c
@@ -569,7 +569,7 @@  static inline int v4l2_reset_crop (zbar_video_t *vdo)
     memset(&crop, 0, sizeof(crop));
     crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     crop.c = ccap.defrect;
-    if(v4l2_ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL)
+    if(v4l2_ioctl(vdo->fd, VIDIOC_S_CROP, &crop) < 0 && errno != EINVAL && errno != ENOTTY)
         return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
                            "setting default crop window (VIDIOC_S_CROP)"));
     return(0);