diff options
| author | Bryan Wu <pengw@nvidia.com> | 2014-02-13 18:13:16 -0800 |
|---|---|---|
| committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-03-06 21:52:02 -0800 |
| commit | e3360fe6b0c141b706a8ab5cfbbdd1de9c471e0c (patch) | |
| tree | 30a69aa765d809c01839e9cb26beaa029f39ee07 /drivers/media/platform/soc_camera | |
| parent | 0b0b738224c33eb2e7d446fa3f2ed440455df74f (diff) | |
video: host: vi: replace host1x_writel with writel
host1x_writel() is a good wrapper API to register writing especially for
virtual device like vi.1. But in V4L2 case, platform driver data is V4L2
specific data struct not the nvhost_device_data struct. So when
host1x_writel() calls get_aperture() which will eventually call
platform_get_drvdata(), it will access V4L2 specific data struct instead
of the right nvhost_device_data struct.
Replacing host1x_writel() to raw writel() and correcting the device ID
checking solve this issue.
Bug 1421146
Change-Id: I9e34da300ccca9da7eff361690353e0d4c1d3d7f
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/351833
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Pablo Ceballos <pceballos@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
| -rw-r--r-- | drivers/media/platform/soc_camera/tegra_camera/common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/tegra_camera/common.c b/drivers/media/platform/soc_camera/tegra_camera/common.c index 50ba778f6cef..00a7049150c5 100644 --- a/drivers/media/platform/soc_camera/tegra_camera/common.c +++ b/drivers/media/platform/soc_camera/tegra_camera/common.c @@ -800,8 +800,10 @@ static int tegra_camera_probe(struct platform_device *pdev) const struct of_device_id *match; match = of_match_device(tegra_vi_of_match, &pdev->dev); - if (match) + if (match) { ndata = (struct nvhost_device_data *) match->data; + pdev->dev.platform_data = ndata; + } /* * Device Tree will initialize this ID as -1 |