From 90cbfe5dce1c0db7293100973f733fe0926446e9 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Thu, 21 Mar 2024 12:11:42 +0200 Subject: [PATCH 1/2] PR #189 from dmipx: d4xx: hwmc return success on ioctl (cherry picked from commit cf7fe647f4bc75226ee22da5c31bf4387c9703a8) --- kernel/realsense/d4xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/realsense/d4xx.c b/kernel/realsense/d4xx.c index ca7e85f..af5eb39 100644 --- a/kernel/realsense/d4xx.c +++ b/kernel/realsense/d4xx.c @@ -2534,8 +2534,10 @@ static int ds5_g_volatile_ctrl(struct v4l2_ctrl *ctrl) u16 dataLen = 0; u16 bufLen = ctrl->dims[0]; ret = ds5_get_hwmc(state, data, bufLen, &dataLen); - if (ret) + if (ret) { + ret = 0; // LRS doesn't expect to get errors with HWMC break; + } /* This is needed for librealsense, to align there code with UVC, * last word is length - 4 bytes header length */ dataLen -= 4; From df64f98b95faec0f44c5cb90ea48b29ebc17dd75 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Sun, 24 Mar 2024 11:00:41 +0200 Subject: [PATCH 2/2] bump driver version --- kernel/realsense/d4xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/realsense/d4xx.c b/kernel/realsense/d4xx.c index af5eb39..1a50166 100644 --- a/kernel/realsense/d4xx.c +++ b/kernel/realsense/d4xx.c @@ -5639,4 +5639,4 @@ MODULE_AUTHOR("Guennadi Liakhovetski ,\n\ Shikun Ding "); MODULE_AUTHOR("Dmitry Perchanov "); MODULE_LICENSE("GPL v2"); -MODULE_VERSION("1.0.1.20"); +MODULE_VERSION("1.0.1.21");