From 750c18baa216b3cb1dbe9289900779065771411e Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 2 Jul 2012 16:03:00 +0800 Subject: [PATCH] --- yaml --- r: 319713 b: refs/heads/master c: e03088972f6e38e90077eaf09acf7b8a327a2da2 h: refs/heads/master i: 319711: a5aba166ae21fda27cc8eb46e5c4d017f24fb2ce v: v3 --- [refs] | 2 +- trunk/drivers/mfd/mc13xxx-spi.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d7fe1b446ca..a36f738d8c38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2761a63945164ef111062828858a80225222ecd7 +refs/heads/master: e03088972f6e38e90077eaf09acf7b8a327a2da2 diff --git a/trunk/drivers/mfd/mc13xxx-spi.c b/trunk/drivers/mfd/mc13xxx-spi.c index 234207f7a831..35636261da6c 100644 --- a/trunk/drivers/mfd/mc13xxx-spi.c +++ b/trunk/drivers/mfd/mc13xxx-spi.c @@ -139,7 +139,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi) mc13xxx->dev = &spi->dev; mutex_init(&mc13xxx->lock); - mc13xxx->regmap = devm_regmap_init_spi(spi, &mc13xxx_regmap_spi_config); + mc13xxx->regmap = devm_regmap_init(&spi->dev, ®map_mc13xxx_bus, + &spi->dev, + &mc13xxx_regmap_spi_config); if (IS_ERR(mc13xxx->regmap)) { ret = PTR_ERR(mc13xxx->regmap); dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",