Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / regulator / rt5190a-regulator.c

diff --git a/drivers/regulator/rt5190a-regulator.c b/drivers/regulator/rt5190a-regulator.c
index 155d4afd00b16c7a8cabf406f621e425c77322ed..4a3397b32582be2bc5ddc05b4d71f9935d1e131f 100644 (file)
--- a/drivers/regulator/rt5190a-regulator.c
+++ b/drivers/regulator/rt5190a-regulator.c
@@ -224,6 +224,9 @@ static int rt5190a_of_parse_cb(struct rt5190a_priv *priv, int rid,
        bool latchup_enable;
        unsigned int mask = RT5190A_RID_BITMASK(rid), val;
 
+       if (!init_data)
+               return 0;
+
        switch (rid) {
        case RT5190A_IDX_BUCK1:
        case RT5190A_IDX_BUCK4: