lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] drivers/media/video/stk-webcam.c: coding style issue

Browse Source 
checkpatch.pl gave some coding style errors, so on the way to the first
patch I added the fix to them.

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Arvydas Sidorenko
2011-09-13 07:18:11 -03:00
committed by Mauro Carvalho Chehab
parent 47a7e6f8d2
commit b57ce4179b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/video/stk-webcam.c
View File

@@ -518,7 +518,7 @@ static int stk_prepare_sio_buffers(struct stk_camera *dev, unsigned n_sbufs)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < n_sbufs; i++) { for (i = 0; i < n_sbufs; i++) {
if (stk_setup_siobuf(dev, i)) if (stk_setup_siobuf(dev, i))
return (dev->n_sbufs > 1)? 0 : -ENOMEM; return (dev->n_sbufs > 1 ? 0 : -ENOMEM);
dev->n_sbufs = i+1; dev->n_sbufs = i+1;
} }
} }
@@ -558,9 +558,8 @@ static int v4l_stk_open(struct file *fp)
vdev = video_devdata(fp); vdev = video_devdata(fp);
dev = vdev_to_camera(vdev); dev = vdev_to_camera(vdev);
if (dev == NULL || !is_present(dev)) { if (dev == NULL || !is_present(dev))
return -ENXIO; return -ENXIO;
}
fp->private_data = dev; fp->private_data = dev;
usb_autopm_get_interface(dev->interface); usb_autopm_get_interface(dev->interface);
@@ -579,7 +578,7 @@ static int v4l_stk_release(struct file *fp)
dev->owner = NULL; dev->owner = NULL;
} }
if(is_present(dev)) if (is_present(dev))
usb_autopm_put_interface(dev->interface); usb_autopm_put_interface(dev->interface);
return 0; return 0;
@@ -656,7 +655,7 @@ static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
return POLLERR; return POLLERR;
if (!list_empty(&dev->sio_full)) if (!list_empty(&dev->sio_full))
return (POLLIN | POLLRDNORM); return POLLIN | POLLRDNORM;
return 0; return 0;
} }
@@ -893,9 +892,9 @@ static int stk_vidioc_g_fmt_vid_cap(struct file *filp,
struct stk_camera *dev = priv; struct stk_camera *dev = priv;
int i; int i;
for (i = 0; i < ARRAY_SIZE(stk_sizes) for (i = 0; i < ARRAY_SIZE(stk_sizes) &&
&& stk_sizes[i].m != dev->vsettings.mode; stk_sizes[i].m != dev->vsettings.mode; i++)
i++); ;
if (i == ARRAY_SIZE(stk_sizes)) { if (i == ARRAY_SIZE(stk_sizes)) {
STK_ERROR("ERROR: mode invalid\n"); STK_ERROR("ERROR: mode invalid\n");
return -EINVAL; return -EINVAL;
@@ -1307,9 +1306,8 @@ static int stk_camera_probe(struct usb_interface *interface,
usb_set_intfdata(interface, dev); usb_set_intfdata(interface, dev);
err = stk_register_video_device(dev); err = stk_register_video_device(dev);
if (err) { if (err)
goto error; goto error;
}
return 0; return 0;