From f8a135c3018efef4b67ac2a5729309c7b19396d7 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 6 May 2011 17:21:25 +0800 Subject: [PATCH] --- yaml --- r: 251940 b: refs/heads/master c: ebf9988ecad6727e5ae950fc2c72b963a1bfc0fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max8925-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2aacdbf4d911..688a31cd665c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cea438dda618797922d0bfc4814e832bab19ac19 +refs/heads/master: ebf9988ecad6727e5ae950fc2c72b963a1bfc0fe diff --git a/trunk/drivers/mfd/max8925-core.c b/trunk/drivers/mfd/max8925-core.c index 58cc5fdde016..e1e59c92f758 100644 --- a/trunk/drivers/mfd/max8925-core.c +++ b/trunk/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);