Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268458
b: refs/heads/master
c: 16a81ef
h: refs/heads/master
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent 7202455 commit 17924be
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e6440141e7673624dc8e2e754b7661c80d47d05
refs/heads/master: 16a81efe8819af8d99d68185cca904e1d6d9d864
22 changes: 11 additions & 11 deletions trunk/drivers/staging/cx25821/cx25821-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1822,25 +1822,25 @@ static long video_ioctl_upstream11(struct file *file, unsigned int cmd,
static long video_ioctl_set(struct file *file, unsigned int cmd,
unsigned long arg)
{
struct cx25821_fh *fh = file->private_data;
struct cx25821_dev *dev = fh->dev;
struct downstream_user_struct *data_from_user;
int command;
int width = 720;
int selected_channel = 0, pix_format = 0, i = 0;
int cif_enable = 0, cif_width = 0;
u32 value = 0;
struct cx25821_fh *fh = file->private_data;
struct cx25821_dev *dev = fh->dev;
struct downstream_user_struct *data_from_user;
int command;
int width = 720;
int selected_channel = 0, pix_format = 0, i = 0;
int cif_enable = 0, cif_width = 0;
u32 value = 0;

data_from_user = (struct downstream_user_struct *)arg;
data_from_user = (struct downstream_user_struct *)arg;

if (!data_from_user) {
pr_err("%s(): User data is INVALID. Returning\n", __func__);
return 0;
}

command = data_from_user->command;
command = data_from_user->command;

if (command != SET_VIDEO_STD && command != SET_PIXEL_FORMAT
if (command != SET_VIDEO_STD && command != SET_PIXEL_FORMAT
&& command != ENABLE_CIF_RESOLUTION && command != REG_READ
&& command != REG_WRITE && command != MEDUSA_READ
&& command != MEDUSA_WRITE) {
Expand Down

0 comments on commit 17924be

Please sign in to comment.