diff options
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 097a42d81e59..2dc002a388b3 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c | |||
@@ -426,7 +426,7 @@ static struct omap_device_pm_latency omap_hsmmc_latency[] = { | |||
426 | void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) | 426 | void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) |
427 | { | 427 | { |
428 | struct omap_hwmod *oh; | 428 | struct omap_hwmod *oh; |
429 | struct omap_device *od; | 429 | struct platform_device *pdev; |
430 | struct omap_device_pm_latency *ohl; | 430 | struct omap_device_pm_latency *ohl; |
431 | char oh_name[MAX_OMAP_MMC_HWMOD_NAME_LEN]; | 431 | char oh_name[MAX_OMAP_MMC_HWMOD_NAME_LEN]; |
432 | struct omap_mmc_platform_data *mmc_data; | 432 | struct omap_mmc_platform_data *mmc_data; |
@@ -467,9 +467,9 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) | |||
467 | mmc_data->controller_flags = mmc_dev_attr->flags; | 467 | mmc_data->controller_flags = mmc_dev_attr->flags; |
468 | } | 468 | } |
469 | 469 | ||
470 | od = omap_device_build(name, ctrl_nr - 1, oh, mmc_data, | 470 | pdev = omap_device_build(name, ctrl_nr - 1, oh, mmc_data, |
471 | sizeof(struct omap_mmc_platform_data), ohl, ohl_cnt, false); | 471 | sizeof(struct omap_mmc_platform_data), ohl, ohl_cnt, false); |
472 | if (IS_ERR(od)) { | 472 | if (IS_ERR(pdev)) { |
473 | WARN(1, "Can't build omap_device for %s:%s.\n", name, oh->name); | 473 | WARN(1, "Can't build omap_device for %s:%s.\n", name, oh->name); |
474 | kfree(mmc_data->slots[0].name); | 474 | kfree(mmc_data->slots[0].name); |
475 | goto done; | 475 | goto done; |
@@ -478,7 +478,7 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) | |||
478 | * return device handle to board setup code | 478 | * return device handle to board setup code |
479 | * required to populate for regulator framework structure | 479 | * required to populate for regulator framework structure |
480 | */ | 480 | */ |
481 | hsmmcinfo->dev = &od->pdev.dev; | 481 | hsmmcinfo->dev = &pdev->dev; |
482 | 482 | ||
483 | done: | 483 | done: |
484 | kfree(mmc_data); | 484 | kfree(mmc_data); |