From ef1ab93f9b09ffc5d3777c22bfd37bfa34f07edd Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:15:02 +0800 Subject: [PATCH] --- yaml --- r: 268453 b: refs/heads/master c: 75965b8f6fcb3f41b256c365d34ba1eca3cdbe93 h: refs/heads/master i: 268451: 13a47141c09624bef892f35835db8a949814ca12 v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.c | 29 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index ef203a8717ad..7a243aa90dd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a911ed9c0eb73530b823a55756cd39763824867 +refs/heads/master: 75965b8f6fcb3f41b256c365d34ba1eca3cdbe93 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index d3c387015d7d..fb89c2785b1a 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -1702,30 +1702,29 @@ int cx25821_is_valid_height(u32 height, v4l2_std_id tvnorm) static long video_ioctl_upstream9(struct file *file, unsigned int cmd, unsigned long arg) { - struct cx25821_fh *fh = file->private_data; - struct cx25821_dev *dev = fh->dev; - int command = 0; - struct upstream_user_struct *data_from_user; + struct cx25821_fh *fh = file->private_data; + struct cx25821_dev *dev = fh->dev; + int command = 0; + struct upstream_user_struct *data_from_user; - data_from_user = (struct upstream_user_struct *)arg; + data_from_user = (struct upstream_user_struct *)arg; if (!data_from_user) { pr_err("%s(): Upstream data is INVALID. Returning\n", __func__); return 0; } - command = data_from_user->command; + command = data_from_user->command; - if (command != UPSTREAM_START_VIDEO && - command != UPSTREAM_STOP_VIDEO) - return 0; + if (command != UPSTREAM_START_VIDEO && command != UPSTREAM_STOP_VIDEO) + return 0; - dev->input_filename = data_from_user->input_filename; - dev->input_audiofilename = data_from_user->input_filename; - dev->vid_stdname = data_from_user->vid_stdname; - dev->pixel_format = data_from_user->pixel_format; - dev->channel_select = data_from_user->channel_select; - dev->command = data_from_user->command; + dev->input_filename = data_from_user->input_filename; + dev->input_audiofilename = data_from_user->input_filename; + dev->vid_stdname = data_from_user->vid_stdname; + dev->pixel_format = data_from_user->pixel_format; + dev->channel_select = data_from_user->channel_select; + dev->command = data_from_user->command; switch (command) { case UPSTREAM_START_VIDEO: