projects
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4cb95d2
)
[PORT FROM R4] [Enzo Support] atomisp: forward motor's private data ioctl to motor...
author
David Cohen
<david.a.cohen@intel.com>
Wed, 30 May 2012 17:35:22 +0000
(10:35 -0700)
committer
buildbot
<buildbot@intel.com>
Tue, 5 Jun 2012 08:21:34 +0000
(
01:21
-0700)
BZ: 27947
Change-Id: If9bee4f78db475f0665e46241f69642ba874f7b4
Orig-Change-Id: Ie728cbf37befcacdfa706886108184645cfebac2
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/51107
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
drivers/media/video/atomisp/atomisp_ioctl.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/atomisp/atomisp_ioctl.c
b/drivers/media/video/atomisp/atomisp_ioctl.c
index
c53ec3e
..
e6c85e1
100644
(file)
--- a/
drivers/media/video/atomisp/atomisp_ioctl.c
+++ b/
drivers/media/video/atomisp/atomisp_ioctl.c
@@
-1773,6
+1773,16
@@
static long atomisp_vidioc_default(struct file *file, void *fh,
case ATOMISP_IOC_G_SENSOR_MODE_DATA:
return atomisp_get_sensor_mode_data(isp, arg);
+ case ATOMISP_IOC_G_MOTOR_PRIV_INT_DATA:
+ if (isp->inputs[isp->input_curr].motor)
+ return v4l2_subdev_call(
+ isp->inputs[isp->input_curr].motor,
+ core, ioctl, cmd, arg);
+ else
+ return v4l2_subdev_call(
+ isp->inputs[isp->input_curr].camera,
+ core, ioctl, cmd, arg);
+
case ATOMISP_IOC_S_EXPOSURE:
case ATOMISP_IOC_G_SENSOR_CALIBRATION_GROUP:
case ATOMISP_IOC_G_SENSOR_PRIV_INT_DATA: