diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
| commit | 015f1e4297ad32f83251f3f4cee2389ce5516e9e (patch) | |
| tree | 1b16e317005dc3d09b0551a4db9182f7f4119f71 /arch/arm/plat-samsung/devs.c | |
| parent | ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes (diff) | |
| parent | ARM: OMAP: convert omap_device_build() and callers to __init (diff) | |
| download | linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.tar.xz linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.zip | |
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 32a6e394db24..f10768e988d4 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -468,8 +468,10 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd) { struct s3c2410_platform_i2c *npd; - if (!pd) + if (!pd) { pd = &default_i2c_data; + pd->bus_num = 0; + } npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c), &s3c_device_i2c0); |