diff --git a/[refs] b/[refs] index dbc0cd24ad0c..feda6e7e00cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1937e191906c612e5675e52dd86c5a4b1d44a81 +refs/heads/master: 4a33b6f8bdf3b5a17737f66eef79b595cf3541a3 diff --git a/trunk/drivers/media/video/cx25821/cx25821-video.c b/trunk/drivers/media/video/cx25821/cx25821-video.c index 4cca7ee75984..278e06b457d6 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-video.c +++ b/trunk/drivers/media/video/cx25821/cx25821-video.c @@ -1829,8 +1829,11 @@ static long video_ioctl_set(struct file *file, unsigned int cmd, 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; + int selected_channel = 0; + int pix_format = 0; + int i = 0; + int cif_enable = 0; + int cif_width = 0; u32 value = 0; data_from_user = (struct downstream_user_struct *)arg;