diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-15 19:03:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:56:08 -0400 |
commit | 7dfff95366f48bf66f77c17cdc9ebd8be696ac5d (patch) | |
tree | c4cb975f5b8b8c3008921d38fa6e4deed9c8dbc9 /drivers/media/video/ov772x.c | |
parent | d33b290a149dafe2e3cc2901ec726bea09a2c0f4 (diff) |
[media] V4L: soc-camera: remove soc-camera bus and devices on it
Now that v4l2 subdevices have got their own device objects, having
one more device in soc-camera clients became redundant and confusing.
This patch removes those devices and the soc-camera bus, they used to
reside on.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov772x.c')
-rw-r--r-- | drivers/media/video/ov772x.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 48895ef863ff..397870f076c1 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -1032,13 +1032,9 @@ static int ov772x_video_probe(struct soc_camera_device *icd, | |||
1032 | u8 pid, ver; | 1032 | u8 pid, ver; |
1033 | const char *devname; | 1033 | const char *devname; |
1034 | 1034 | ||
1035 | /* | 1035 | /* We must have a parent by now. And it cannot be a wrong one. */ |
1036 | * We must have a parent by now. And it cannot be a wrong one. | 1036 | BUG_ON(!icd->parent || |
1037 | * So this entire test is completely redundant. | 1037 | to_soc_camera_host(icd->parent)->nr != icd->iface); |
1038 | */ | ||
1039 | if (!icd->dev.parent || | ||
1040 | to_soc_camera_host(icd->dev.parent)->nr != icd->iface) | ||
1041 | return -ENODEV; | ||
1042 | 1038 | ||
1043 | /* | 1039 | /* |
1044 | * check and show product ID and manufacturer ID | 1040 | * check and show product ID and manufacturer ID |