git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
drivers
/
mfd
/
max8925-core.c
diff --git
a/drivers/mfd/max8925-core.c
b/drivers/mfd/max8925-core.c
index
58cc5fd
..
e1e59c9
100644
(file)
--- a/
drivers/mfd/max8925-core.c
+++ b/
drivers/mfd/max8925-core.c
@@
-627,7
+627,7
@@
int __devinit max8925_device_init(struct max8925_chip *chip,
goto out_dev;
}
- if (pdata
&& pdata->regulator[0]
) {
+ if (pdata) {
ret = mfd_add_devices(chip->dev, 0, ®ulator_devs[0],
ARRAY_SIZE(regulator_devs),
®ulator_resources[0], 0);