From 604772403f399b99ab734961618f770cf94cd0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20R=C3=A9tornaz?= Date: Fri, 22 Jul 2011 16:17:07 +0200 Subject: [PATCH] --- yaml --- r: 273399 b: refs/heads/master c: 4a2a734306a6e3cc7766d2117ec142de9262f217 h: refs/heads/master i: 273397: d63575eacc8db967a1edc032e0bb8661d8700abe 273395: c5779da4dcdf0ddb149bc9cbd93ed7604117491a 273391: eb0cea7f15bf15ca9e4d56d0b72ef4f9b30d9952 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/mc13xxx-core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6b6ba9a4fe7..963d4c94bcda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a980bf73ba8ff76e6fab0644513c1127d852d0a8 +refs/heads/master: 4a2a734306a6e3cc7766d2117ec142de9262f217 diff --git a/trunk/drivers/mfd/mc13xxx-core.c b/trunk/drivers/mfd/mc13xxx-core.c index 5f782adffc1d..dd232ea73757 100644 --- a/trunk/drivers/mfd/mc13xxx-core.c +++ b/trunk/drivers/mfd/mc13xxx-core.c @@ -750,10 +750,8 @@ static int mc13xxx_probe(struct spi_device *spi) if (pdata->flags & MC13XXX_USE_CODEC) mc13xxx_add_subdevice(mc13xxx, "%s-codec"); - if (pdata->flags & MC13XXX_USE_REGULATOR) { - mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator", - &pdata->regulators, sizeof(pdata->regulators)); - } + mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator", + &pdata->regulators, sizeof(pdata->regulators)); if (pdata->flags & MC13XXX_USE_RTC) mc13xxx_add_subdevice(mc13xxx, "%s-rtc");