diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /drivers/media/video/v4l2-subdev.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/media/video/v4l2-subdev.c')
| -rw-r--r-- | drivers/media/video/v4l2-subdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c index e3612f29d0df..fbe9cc0d433a 100644 --- a/drivers/media/video/v4l2-subdev.c +++ b/drivers/media/video/v4l2-subdev.c | |||
| @@ -37,7 +37,7 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) | |||
| 37 | return v4l2_subdev_call(sd, core, queryctrl, arg); | 37 | return v4l2_subdev_call(sd, core, queryctrl, arg); |
| 38 | case VIDIOC_LOG_STATUS: | 38 | case VIDIOC_LOG_STATUS: |
| 39 | return v4l2_subdev_call(sd, core, log_status); | 39 | return v4l2_subdev_call(sd, core, log_status); |
| 40 | case VIDIOC_G_CHIP_IDENT: | 40 | case VIDIOC_DBG_G_CHIP_IDENT: |
| 41 | return v4l2_subdev_call(sd, core, g_chip_ident, arg); | 41 | return v4l2_subdev_call(sd, core, g_chip_ident, arg); |
| 42 | case VIDIOC_INT_S_STANDBY: | 42 | case VIDIOC_INT_S_STANDBY: |
| 43 | return v4l2_subdev_call(sd, core, s_standby, arg ? (*(u32 *)arg) : 0); | 43 | return v4l2_subdev_call(sd, core, s_standby, arg ? (*(u32 *)arg) : 0); |