summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <lg@denx.de>2009-04-03 15:34:02 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-07 02:43:58 +0200
commitb71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88 (patch)
treee16c24632215a9d5a5e28ffc64394dae4b297367 /drivers/media
parentV4L/DVB (11347): mt9t031: use platform power hook (diff)
downloadlinux-b71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88.tar.xz
linux-b71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88.zip
V4L/DVB (11349): mx3-camera: adapt the clock definition and the driver to the new clock naming
With the i.MX31 transition to clkdev clock names have changed, but mistakenly the "mx3-camera.0" has been registered with a non-NULL connection ID, which is not necessary, since this is the only clock, used by the capture interface driver. Fix the clock definition and the driver to use NULL as a connection ID. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/mx3_camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 70629e172e65..c462b811e994 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -1100,7 +1100,7 @@ static int mx3_camera_probe(struct platform_device *pdev)
}
memset(mx3_cam, 0, sizeof(*mx3_cam));
- mx3_cam->clk = clk_get(&pdev->dev, "csi_clk");
+ mx3_cam->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(mx3_cam->clk)) {
err = PTR_ERR(mx3_cam->clk);
goto eclkget;