aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-12-11 09:15:05 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 06:27:15 -0500
commit5d28d525452f170e30bc038955439731462a5228 (patch)
tree319c221f63b580cdec53a046b2fe5af2e0b92b36 /drivers/media/video/soc_camera.c
parent325361088b73269f4cc96256276a142addbf3454 (diff)
V4L/DVB (13645): soc-camera: fix multi-line comment coding style
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 804c675f2cb9..5fdedc766401 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -621,8 +621,10 @@ static int soc_camera_streamoff(struct file *file, void *priv,
621 621
622 mutex_lock(&icd->video_lock); 622 mutex_lock(&icd->video_lock);
623 623
624 /* This calls buf_release from host driver's videobuf_queue_ops for all 624 /*
625 * remaining buffers. When the last buffer is freed, stop capture */ 625 * This calls buf_release from host driver's videobuf_queue_ops for all
626 * remaining buffers. When the last buffer is freed, stop capture
627 */
626 videobuf_streamoff(&icf->vb_vidq); 628 videobuf_streamoff(&icf->vb_vidq);
627 629
628 v4l2_subdev_call(sd, video, s_stream, 0); 630 v4l2_subdev_call(sd, video, s_stream, 0);
@@ -1004,8 +1006,10 @@ epower:
1004 return ret; 1006 return ret;
1005} 1007}
1006 1008
1007/* This is called on device_unregister, which only means we have to disconnect 1009/*
1008 * from the host, but not remove ourselves from the device list */ 1010 * This is called on device_unregister, which only means we have to disconnect
1011 * from the host, but not remove ourselves from the device list
1012 */
1009static int soc_camera_remove(struct device *dev) 1013static int soc_camera_remove(struct device *dev)
1010{ 1014{
1011 struct soc_camera_device *icd = to_soc_camera_dev(dev); 1015 struct soc_camera_device *icd = to_soc_camera_dev(dev);
@@ -1205,8 +1209,10 @@ static int soc_camera_device_register(struct soc_camera_device *icd)
1205 } 1209 }
1206 1210
1207 if (num < 0) 1211 if (num < 0)
1208 /* ok, we have 256 cameras on this host... 1212 /*
1209 * man, stay reasonable... */ 1213 * ok, we have 256 cameras on this host...
1214 * man, stay reasonable...
1215 */
1210 return -ENOMEM; 1216 return -ENOMEM;
1211 1217
1212 icd->devnum = num; 1218 icd->devnum = num;
@@ -1333,9 +1339,11 @@ escdevreg:
1333 return ret; 1339 return ret;
1334} 1340}
1335 1341
1336/* Only called on rmmod for each platform device, since they are not 1342/*
1343 * Only called on rmmod for each platform device, since they are not
1337 * hot-pluggable. Now we know, that all our users - hosts and devices have 1344 * hot-pluggable. Now we know, that all our users - hosts and devices have
1338 * been unloaded already */ 1345 * been unloaded already
1346 */
1339static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) 1347static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
1340{ 1348{
1341 struct soc_camera_device *icd = platform_get_drvdata(pdev); 1349 struct soc_camera_device *icd = platform_get_drvdata(pdev);