diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
| commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch) | |
| tree | e19ab2c41ae47250fd614418022b32aa783aa563 /drivers/mfd/88pm805.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 3c7c5dab44d6c8861bc86dab924353d8d40344f8 (diff) | |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'drivers/mfd/88pm805.c')
| -rw-r--r-- | drivers/mfd/88pm805.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c index 6146583589f6..c20a31136f04 100644 --- a/drivers/mfd/88pm805.c +++ b/drivers/mfd/88pm805.c | |||
| @@ -216,7 +216,8 @@ static int __devinit device_805_init(struct pm80x_chip *chip) | |||
| 216 | } | 216 | } |
| 217 | 217 | ||
| 218 | ret = mfd_add_devices(chip->dev, 0, &codec_devs[0], | 218 | ret = mfd_add_devices(chip->dev, 0, &codec_devs[0], |
| 219 | ARRAY_SIZE(codec_devs), &codec_resources[0], 0); | 219 | ARRAY_SIZE(codec_devs), &codec_resources[0], 0, |
| 220 | NULL); | ||
| 220 | if (ret < 0) { | 221 | if (ret < 0) { |
| 221 | dev_err(chip->dev, "Failed to add codec subdev\n"); | 222 | dev_err(chip->dev, "Failed to add codec subdev\n"); |
| 222 | goto out_codec; | 223 | goto out_codec; |