diff options
-rw-r--r-- | arch/arm/mach-mx3/clock.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mx3_camera.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index ca46f4801c3d..9957a11533a4 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c | |||
@@ -533,7 +533,7 @@ static struct clk_lookup lookups[] __initdata = { | |||
533 | _REGISTER_CLOCK(NULL, "kpp", kpp_clk) | 533 | _REGISTER_CLOCK(NULL, "kpp", kpp_clk) |
534 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) | 534 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) |
535 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) | 535 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) |
536 | _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) | 536 | _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) |
537 | _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) | 537 | _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) |
538 | _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) | 538 | _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) |
539 | _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) | 539 | _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) |
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; |