Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick PR #189 and update version #190

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Cherry pick PR #189 and update version #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90cbfe5
PR #189 from dmipx: d4xx: hwmc return success on ioctl
Nir-Az Mar 21, 2024
df64f98
bump driver version
Nir-Az Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions kernel/realsense/d4xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -5637,4 +5639,4 @@ MODULE_AUTHOR("Guennadi Liakhovetski <[email protected]>,\n\
Shikun Ding <[email protected]>");
MODULE_AUTHOR("Dmitry Perchanov <[email protected]>");
MODULE_LICENSE("GPL v2");
MODULE_VERSION("1.0.1.20");
MODULE_VERSION("1.0.1.21");
Loading