Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm...

[~andy/linux] / drivers / regulator / twl-regulator.c

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 8ebd785485c73ddceba4047facf3960192a2cdf2..fed28abef419b81e1988c63eb24eac2fffab2180 100644 (file)
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -58,7 +58,7 @@ struct twlreg_info {
        struct regulator_desc   desc;
 
        /* chip specific features */
-       unsigned long           features;
+       unsigned long           features;
 
        /*
         * optional override functions for voltage set/get
@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev)
        if (!initdata)
                return -EINVAL;
 
-       info = kmemdup(template, sizeof (*info), GFP_KERNEL);
+       info = kmemdup(template, sizeof(*info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;