diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:01:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:01:06 -0700 |
| commit | e83ddb335468cdd9ea6e9767eb30b64d8ff176ce (patch) | |
| tree | af7ca0b5be74b713970149efaebe682596523252 /drivers/mfd/abx500-core.c | |
| parent | 14a4fa20a10d76eb98b7feb25be60735217929ba (diff) | |
| parent | d0a11693967295772d2a7c22b6b37eb20684e709 (diff) | |
| download | linux-e83ddb335468cdd9ea6e9767eb30b64d8ff176ce.tar.gz linux-e83ddb335468cdd9ea6e9767eb30b64d8ff176ce.tar.bz2 linux-e83ddb335468cdd9ea6e9767eb30b64d8ff176ce.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (40 commits)
mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe
mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe
mfd: Add TPS6586x driver
mfd: Use macros instead of some constant magic numbers for menelaus
mfd: Fix menelaus mmc slot 2 misconfiguration
mfd: Missing slab.h includes
mfd: Fix wrong wm8350-core kfree in error path
mfd: Fix wm8994_device_init() return value
mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path
mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit
mfd: Fix tc6387xb resource reclaim
mfd: Fix wrong goto labels for tc6393xb error handling
mfd: Get rid of now unused mc13783 private header
hwmon: Don't access struct mc13783 directly from mc13783-adc
mfd: New mc13783 function exposing flags
mfd: Check jz4740-adc kmalloc() result
mfd: Fix jz4740-adc resource reclaim in probe error path
mfd: Add WM8321 support
mfd: Add stmpe auto sleep feature
...
Diffstat (limited to 'drivers/mfd/abx500-core.c')
| -rw-r--r-- | drivers/mfd/abx500-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c index 3b3b97ec32a7..f12720dbe126 100644 --- a/drivers/mfd/abx500-core.c +++ b/drivers/mfd/abx500-core.c @@ -36,7 +36,7 @@ int abx500_register_ops(struct device *dev, struct abx500_ops *ops) struct abx500_device_entry *dev_entry; dev_entry = kzalloc(sizeof(struct abx500_device_entry), GFP_KERNEL); - if (IS_ERR(dev_entry)) { + if (!dev_entry) { dev_err(dev, "register_ops kzalloc failed"); return -ENOMEM; } |