From 3907fbc068a868bef66aa16008573d39e8f66524 Mon Sep 17 00:00:00 2001 From: Alberto Panizzo Date: Mon, 14 Dec 2009 18:18:05 +0100 Subject: [PATCH] --- yaml --- r: 179587 b: refs/heads/master c: 1e02b2c32484bfe0c5564d9be060b7d9821307b9 h: refs/heads/master i: 179585: 3a7701f891790fb1f880847ede949a3e99d9169f 179583: 3a80cd90cca612a934a9bff6d9920f5b3fa3bdb7 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/mc13783-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 45e23afc3979..869563e637a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e6ba2dfa2d6c4691a83a63e211990a8bd7b788b +refs/heads/master: 1e02b2c32484bfe0c5564d9be060b7d9821307b9 diff --git a/trunk/drivers/mfd/mc13783-core.c b/trunk/drivers/mfd/mc13783-core.c index a1ade2324ea9..735c8a4d164f 100644 --- a/trunk/drivers/mfd/mc13783-core.c +++ b/trunk/drivers/mfd/mc13783-core.c @@ -619,6 +619,8 @@ static int mc13783_probe(struct spi_device *spi) } /* This should go away (END) */ + mc13783_unlock(mc13783); + if (pdata->flags & MC13783_USE_ADC) mc13783_add_subdevice(mc13783, "mc13783-adc"); @@ -641,8 +643,6 @@ static int mc13783_probe(struct spi_device *spi) if (pdata->flags & MC13783_USE_TOUCHSCREEN) mc13783_add_subdevice(mc13783, "mc13783-ts"); - mc13783_unlock(mc13783); - return 0; }