diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 14:06:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 14:06:46 +1100 |
| commit | 820c3c4345dc4cd01fa47d91ec1343c2712d9a92 (patch) | |
| tree | f17c5826ec6a38ff72f0bd77a2e44a2294809282 /drivers/mfd/da9052-spi.c | |
| parent | 8041a4814adfeb7d2823e51bb6b482e6538a87f7 (diff) | |
| parent | d86c21fd31114e3ef9fae64be335c76aa22859dc (diff) | |
Merge remote-tracking branch 'mfd/for-mfd-next'
Diffstat (limited to 'drivers/mfd/da9052-spi.c')
| -rw-r--r-- | drivers/mfd/da9052-spi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c index 17666b40b70c..45ae0b7d13ef 100644 --- a/drivers/mfd/da9052-spi.c +++ b/drivers/mfd/da9052-spi.c @@ -23,6 +23,7 @@ static int da9052_spi_probe(struct spi_device *spi) { + struct regmap_config config; int ret; const struct spi_device_id *id = spi_get_device_id(spi); struct da9052 *da9052; @@ -40,10 +41,10 @@ static int da9052_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, da9052); - da9052_regmap_config.read_flag_mask = 1; - da9052_regmap_config.write_flag_mask = 0; + config = da9052_regmap_config; + config.read_flag_mask = 1; - da9052->regmap = devm_regmap_init_spi(spi, &da9052_regmap_config); + da9052->regmap = devm_regmap_init_spi(spi, &config); if (IS_ERR(da9052->regmap)) { ret = PTR_ERR(da9052->regmap); dev_err(&spi->dev, "Failed to allocate register map: %d\n", |