diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2009-12-10 08:51:38 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-15 21:17:57 -0500 |
commit | 46b21094cee16bc7e531d7d6cd66fb5ea05065d4 (patch) | |
tree | 0076c71aef1f1092934a7536ab18dfccffb13907 /drivers/media/video/soc_camera.c | |
parent | 50462eb065e12f45851a9959a90d46b758944552 (diff) |
V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments
Now that the video_device registration is tested using
video_is_registered(), drivers don't need to initialize the
video_device::minor field to -1 anymore.
Remove those unneeded assignments.
[mchehab.redhat.com: removed tm6000 changes as tm6000 is not ready yet for submission even on staging]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 95fdeb23c2c1..804c675f2cb9 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -1268,7 +1268,6 @@ static int video_dev_create(struct soc_camera_device *icd) | |||
1268 | vdev->fops = &soc_camera_fops; | 1268 | vdev->fops = &soc_camera_fops; |
1269 | vdev->ioctl_ops = &soc_camera_ioctl_ops; | 1269 | vdev->ioctl_ops = &soc_camera_ioctl_ops; |
1270 | vdev->release = video_device_release; | 1270 | vdev->release = video_device_release; |
1271 | vdev->minor = -1; | ||
1272 | vdev->tvnorms = V4L2_STD_UNKNOWN; | 1271 | vdev->tvnorms = V4L2_STD_UNKNOWN; |
1273 | 1272 | ||
1274 | icd->vdev = vdev; | 1273 | icd->vdev = vdev; |
@@ -1291,8 +1290,7 @@ static int soc_camera_video_start(struct soc_camera_device *icd) | |||
1291 | !icd->ops->set_bus_param) | 1290 | !icd->ops->set_bus_param) |
1292 | return -EINVAL; | 1291 | return -EINVAL; |
1293 | 1292 | ||
1294 | ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, | 1293 | ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1); |
1295 | icd->vdev->minor); | ||
1296 | if (ret < 0) { | 1294 | if (ret < 0) { |
1297 | dev_err(&icd->dev, "video_register_device failed: %d\n", ret); | 1295 | dev_err(&icd->dev, "video_register_device failed: %d\n", ret); |
1298 | return ret; | 1296 | return ret; |