diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 09:13:58 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 09:13:58 (GMT) |
| commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
| tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/video/pwc/pwc-ctrl.c | |
| parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | linux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.xz | |
Merge commit 'v2.6.27-rc6' into timers/urgent
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; } /* |