diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
| commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
| tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /drivers/media/video/pwc/pwc-ctrl.c | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
| parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
| download | linux-db0a2901a32c44510d7d429358d017143a649a70.tar.xz | |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'drivers/media/video/pwc/pwc-ctrl.c')
| -rw-r--r-- | drivers/media/video/pwc/pwc-ctrl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c index 1cccd5c7..dbc5607 100644 --- a/drivers/media/video/pwc/pwc-ctrl.c +++ b/drivers/media/video/pwc/pwc-ctrl.c @@ -1635,15 +1635,15 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) case VIDIOCPWCGVIDCMD: { - ARG_DEF(struct pwc_video_command, cmd); - - ARGR(cmd).type = pdev->type; - ARGR(cmd).release = pdev->release; - ARGR(cmd).command_len = pdev->cmd_len; - memcpy(&ARGR(cmd).command_buf, pdev->cmd_buf, pdev->cmd_len); - ARGR(cmd).bandlength = pdev->vbandlength; - ARGR(cmd).frame_size = pdev->frame_size; - ARG_OUT(cmd) + ARG_DEF(struct pwc_video_command, vcmd); + + ARGR(vcmd).type = pdev->type; + ARGR(vcmd).release = pdev->release; + ARGR(vcmd).command_len = pdev->cmd_len; + memcpy(&ARGR(vcmd).command_buf, pdev->cmd_buf, pdev->cmd_len); + ARGR(vcmd).bandlength = pdev->vbandlength; + ARGR(vcmd).frame_size = pdev->frame_size; + ARG_OUT(vcmd) break; } /* |