summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorPeter Gielda <pgielda@antmicro.com>2013-04-22 14:18:32 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2013-06-12 21:43:53 +0200
commit86ab95ca8d2d946deef1cf126cd41fc9b91ba765 (patch)
treea4ced4e83330a2dc27e83c092b986477ed22911f /drivers/media/video
parentc0cd5eab127dadf3eebf6e9cc0006d9e7c9cbd51 (diff)
tegra_v4l2 fix init issue
Fix issue with nvhost_client_device_init being issued more than once.
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tegra_v4l2_camera.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/tegra_v4l2_camera.c b/drivers/media/video/tegra_v4l2_camera.c
index 408b0a825383..6fd6ce7299f6 100644
--- a/drivers/media/video/tegra_v4l2_camera.c
+++ b/drivers/media/video/tegra_v4l2_camera.c
@@ -1673,7 +1673,9 @@ static int __devinit tegra_camera_probe(struct nvhost_device *ndev,
if (err)
goto exit_put_clk_csus;
- nvhost_client_device_init(ndev);
+ // initialize nvhost client device only the first time
+ if (ndev->power_attrib == NULL)
+ nvhost_client_device_init(ndev);
pcdev->vi_base = ndev->aperture;