diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-16 03:03:38 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-28 00:56:08 +0400 |
| commit | 7dfff95366f48bf66f77c17cdc9ebd8be696ac5d (patch) | |
| tree | c4cb975f5b8b8c3008921d38fa6e4deed9c8dbc9 /drivers/media/video/ov9640.c | |
| parent | d33b290a149dafe2e3cc2901ec726bea09a2c0f4 (diff) | |
| download | linux-7dfff95366f48bf66f77c17cdc9ebd8be696ac5d.tar.xz | |
[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/ov9640.c')
| -rw-r--r-- | drivers/media/video/ov9640.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c index 5173ac449dd8..3681a6ff0815 100644 --- a/drivers/media/video/ov9640.c +++ b/drivers/media/video/ov9640.c @@ -657,16 +657,9 @@ static int ov9640_video_probe(struct soc_camera_device *icd, const char *devname; int ret = 0; - /* - * We must have a parent by now. And it cannot be a wrong one. - * So this entire test is completely redundant. - */ - if (!icd->dev.parent || - to_soc_camera_host(icd->dev.parent)->nr != icd->iface) { - dev_err(&client->dev, "Parent missing or invalid!\n"); - ret = -ENODEV; - goto err; - } + /* We must have a parent by now. And it cannot be a wrong one. */ + BUG_ON(!icd->parent || + to_soc_camera_host(icd->parent)->nr != icd->iface); /* * check and show product ID and manufacturer ID |