Merge tag 'regmap-v3.15-nodev' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

[jlayton/linux.git] / drivers / base / regmap / regmap.c

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index d0a072463a04ff1c4d3f83cbd66de587be4c5e44..63e30ef096e2be5e16a1e989bba22dd3b6c69f8d 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -761,10 +761,11 @@ skip_format_initialization:
        if (ret != 0)
                goto err_range;
 
-       if (dev)
+       if (dev) {
                ret = regmap_attach_dev(dev, map, config);
                if (ret != 0)
                        goto err_regcache;
+       }
 
        return map;