Merge branch 'mailbox-linux-3.8.y' into ti-linux-3.8.y

[android-sdk/kernel-video.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 37209ae01148105e34e912b77882dea41ee70bc9..2d4f9c02dccf29cae8b5e322f046fed2ca252cb4 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -336,7 +336,6 @@ static inline void __init omap_init_mbox(void)
        struct omap_hwmod *oh;
        struct platform_device *pdev;
        struct omap_mbox_pdata *pdata;
-       u32 pdata_len;
 
        oh = omap_hwmod_lookup("mailbox");
        if (!oh) {
@@ -349,9 +348,7 @@ static inline void __init omap_init_mbox(void)
        }
 
        pdata = (struct omap_mbox_pdata *)oh->dev_attr;
-       pdata_len = (pdata->info_cnt * (sizeof(struct omap_mbox_dev_info))) +
-                       (2 * sizeof(u32));
-       pdev = omap_device_build("omap-mailbox", -1, oh, pdata, pdata_len,
+       pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata),
                                                                NULL, 0, 0);
        WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",
                                                __func__, PTR_ERR(pdev));