TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msm: camera: Update the status of the ctrlcmd to userspace

Browse Source 
When the cmd sent by HAL is notified to the daemon, copy the
result of the processing of that ctrl command like status, back
to the userspace.

Change-Id: I6209981fb18abd7d4bd55e1f6525998f7fa14ddf
CRs-Fixed: 411688
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
This commit is contained in:
Kiran Kumar H N
2012-11-19 19:06:02 -08:00
committed by Stephen Boyd
parent 6204f9f258
commit 00550a57cc
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/video/msm/server/msm_cam_server.c
View File

@@ -474,16 +474,15 @@ static int msm_server_control(struct msm_cam_server_dev *server_dev,
kfree(ctrlcmd);
free_qcmd(rcmd);
D("%s: rc %d\n", __func__, rc);
/* rc is the time elapsed. */
if (rc >= 0) {
/* TODO: Refactor msm_ctrl_cmd::status field */
if (out->status == 0)
rc = -1;
else if (out->status == 1 || out->status == 4)
rc = 0;
else
rc = -EINVAL;
}
/* rc is the time elapsed.
* This means that the communication with the daemon itself was
* successful(irrespective of the handling of the ctrlcmd).
* So, just reset the rc to 0 to indicate success.
* Its upto the caller to parse the ctrlcmd to check the status. We
* dont need to parse it here. */
if (rc >= 0)
rc = 0;
return rc;
ctrlcmd_alloc_fail:
@@ -846,9 +845,9 @@ int msm_server_proc_ctrl_cmd(struct msm_cam_v4l2_device *pcam,
rc = -EINVAL;
goto end;
}
tmp_cmd.status = cmd_ptr->status = ctrlcmd.status;
if (copy_to_user((void __user *)ioctl_ptr->ioctl_ptr,
(void *)&tmp_cmd, cmd_len)) {
(void *)cmd_ptr, cmd_len)) {
pr_err("%s: copy_to_user failed in cpy, size=%d\n",
__func__, cmd_len);
rc = -EINVAL;