diff options
author | Guennadi Liakhovetski <lg@denx.de> | 2009-04-03 09:34:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:43:58 -0400 |
commit | b71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88 (patch) | |
tree | e16c24632215a9d5a5e28ffc64394dae4b297367 /drivers/media/video/mx3_camera.c | |
parent | f982651410f00378e42d9daab274adee5c762523 (diff) |
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/video/mx3_camera.c')
-rw-r--r-- | drivers/media/video/mx3_camera.c | 2 |
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) | |||
1100 | } | 1100 | } |
1101 | memset(mx3_cam, 0, sizeof(*mx3_cam)); | 1101 | memset(mx3_cam, 0, sizeof(*mx3_cam)); |
1102 | 1102 | ||
1103 | mx3_cam->clk = clk_get(&pdev->dev, "csi_clk"); | 1103 | mx3_cam->clk = clk_get(&pdev->dev, NULL); |
1104 | if (IS_ERR(mx3_cam->clk)) { | 1104 | if (IS_ERR(mx3_cam->clk)) { |
1105 | err = PTR_ERR(mx3_cam->clk); | 1105 | err = PTR_ERR(mx3_cam->clk); |
1106 | goto eclkget; | 1106 | goto eclkget; |