diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-06 17:31:33 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-06 17:31:33 +0100 |
| commit | ab74a91429ed3e10b27632e22ff681be90d9cd0d (patch) | |
| tree | 269f647823dc06d70054bfe0fc51418c318c4802 /arch/arm/plat-samsung/devs.c | |
| parent | ARM: bcmring: fix build failure in mach-bcmring/arch.c (diff) | |
| parent | ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board (diff) | |
| download | linux-ab74a91429ed3e10b27632e22ff681be90d9cd0d.tar.xz linux-ab74a91429ed3e10b27632e22ff681be90d9cd0d.zip | |
Merge branch 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board
ARM: EXYNOS: Correct framebuffer window size on Nuri board
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type"
ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210
ARM: EXYNOS: Remove build warning without enabling PM
ARM: SAMSUNG: Fix platform data setup for I2C adapter 0
ARM: EXYNOS: fix non-SMP builds for EXYNOS4
ARM: S3C6410: Use device names for both I2C clocks
ARM: S3C64XX: Make s3c64xx_init_uarts() static
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); |