summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx5/devices-imx53.h
diff options
context:
space:
mode:
authorJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:05:31 -0500
committerJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:05:31 -0500
commit6ab35eebe70d1af98bb4c0fc30d99b350ff97146 (patch)
treeb8b7b28493f6b4f6f696b8045437ff79cc2d9a1a /arch/arm/mach-mx5/devices-imx53.h
parentdfab7be58bc1ae8910fe363c8ab78f63483cf613 (diff)
ENGR00211151: Cannot connect to Camera after start/stop Camcorder many timesimx-android-r14-beta
Aligned latest i.MX6 ICS 3.0.15 kernel to pick up latest media changes for Camera support. Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx5/devices-imx53.h')
-rwxr-xr-xarch/arm/mach-mx5/devices-imx53.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h
index b8bf44f735a4..1694e29072d3 100755
--- a/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-mx5/devices-imx53.h
@@ -74,9 +74,9 @@ extern const struct imx_srtc_data imx53_imx_srtc_data __initconst;
platform_device_register_resndata(NULL, "mxc_v4l2_output",\
id, NULL, 0, NULL, 0);
-#define imx53_add_v4l2_capture(id) \
+#define imx53_add_v4l2_capture(id, pdata) \
platform_device_register_resndata(NULL, "mxc_v4l2_capture",\
- id, NULL, 0, NULL, 0);
+ id, NULL, 0, pdata, sizeof(*pdata));
extern const struct imx_ahci_data imx53_ahci_data[] __initconst;
#define imx53_add_ahci(id, pdata) \