diff options
| author | Jason Kridner <jkridner@gmail.com> | 2019-01-11 10:02:13 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-01-21 14:18:15 +0100 |
| commit | f165988b77ef849eb0c1aebd94fe778024f88314 (patch) | |
| tree | 93d688a7efcaa032c972a33fa363767f0d49a748 /drivers/pinctrl | |
| parent | e3f72b749da2bf63bed7409e416f160418d475b6 (diff) | |
| download | linux-stable-f165988b77ef849eb0c1aebd94fe778024f88314.tar.gz linux-stable-f165988b77ef849eb0c1aebd94fe778024f88314.tar.bz2 linux-stable-f165988b77ef849eb0c1aebd94fe778024f88314.zip | |
pinctrl: mcp23s08: spi: Fix regmap allocation for mcp23s18
Fixes issue created by 9b3e4207661e67f04c72af15e29f74cd944f5964.
It wasn't possible for one_regmap_config to be non-NULL at the point
it was tested for mcp23s18 devices.
Applied the same pattern of allocating one_regmap_config using
devm_kmemdump() and then initializing the local regmap structure
from that.
Signed-off-by: Jason Kridner <jdk@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-mcp23s08.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c index b03481ef99a1..98905d4a79ca 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08.c +++ b/drivers/pinctrl/pinctrl-mcp23s08.c @@ -832,8 +832,13 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, break; case MCP_TYPE_S18: + one_regmap_config = + devm_kmemdup(dev, &mcp23x17_regmap, + sizeof(struct regmap_config), GFP_KERNEL); + if (!one_regmap_config) + return -ENOMEM; mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp, - &mcp23x17_regmap); + one_regmap_config); mcp->reg_shift = 1; mcp->chip.ngpio = 16; mcp->chip.label = "mcp23s18"; |