diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-20 19:11:08 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-20 19:11:08 +0100 |
| commit | 856c5403462419eff9a7891efeee7bddc2a08af6 (patch) | |
| tree | 2f4bb681e10ec1f895600fa0a4b0b177dadf6fb4 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: OMAP: Fix build error when mmc_omap is built as module (diff) | |
| download | linux-856c5403462419eff9a7891efeee7bddc2a08af6.tar.xz linux-856c5403462419eff9a7891efeee7bddc2a08af6.zip | |
Merge branch 'fixes-mmc' into fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 8d7ce11cfeaf..c126461836ac 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -296,8 +296,10 @@ static void enable_board_wakeup_source(void) void __init zoom_peripherals_init(void) { - if (wl12xx_set_platform_data(&omap_zoom_wlan_data)) - pr_err("error setting wl12xx data\n"); + int ret = wl12xx_set_platform_data(&omap_zoom_wlan_data); + + if (ret) + pr_err("error setting wl12xx data: %d\n", ret); omap_i2c_init(); platform_device_register(&omap_vwlan_device); |