summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAlberto Panizzo <maramaopercheseimorto@gmail.com>2009-12-14 18:18:05 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2010-01-18 12:30:28 +0100
commit1e02b2c32484bfe0c5564d9be060b7d9821307b9 (patch)
tree0b40b6a9223be5b5b79b465a2cc6d814ac4dc222 /drivers/mfd
parent8e6ba2dfa2d6c4691a83a63e211990a8bd7b788b (diff)
downloadlinux-stable-1e02b2c32484bfe0c5564d9be060b7d9821307b9.tar.gz
linux-stable-1e02b2c32484bfe0c5564d9be060b7d9821307b9.tar.bz2
linux-stable-1e02b2c32484bfe0c5564d9be060b7d9821307b9.zip
mfd: Unlock mc13783 before subsystems initialisation, at probe time.
With this, mc13783 subsystems drivers can configure the mc13783 chip reading and writing registers. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/mc13783-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c
index a1ade2324ea9..735c8a4d164f 100644
--- a/drivers/mfd/mc13783-core.c
+++ b/drivers/mfd/mc13783-core.c
@@ -619,6 +619,8 @@ err_revision:
}
/* This should go away (END) */
+ mc13783_unlock(mc13783);
+
if (pdata->flags & MC13783_USE_ADC)
mc13783_add_subdevice(mc13783, "mc13783-adc");
@@ -641,8 +643,6 @@ err_revision:
if (pdata->flags & MC13783_USE_TOUCHSCREEN)
mc13783_add_subdevice(mc13783, "mc13783-ts");
- mc13783_unlock(mc13783);
-
return 0;
}