diff options
| author | Daniel M. Weeks <dan@danweeks.net> | 2013-07-19 00:19:58 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-16 15:07:46 +0200 |
| commit | 8a564065825cb92d412f107812ef50fe9ef43668 (patch) | |
| tree | 9190a65f02945146c80fe78cb280e33ef19d814b | |
| parent | 8b628c659ce1e2a8714ebcfe55f80457a4ebe734 (diff) | |
| download | linux-stable-8a564065825cb92d412f107812ef50fe9ef43668.tar.gz linux-stable-8a564065825cb92d412f107812ef50fe9ef43668.tar.bz2 linux-stable-8a564065825cb92d412f107812ef50fe9ef43668.zip | |
gpio-mcp23s08: i2c: auto-select base if no DT match or platform data
The call to gpiochip_add made by this driver is capable of auto-selecting a
base if one is not provided. However, it was not called unless there was
already a DT entry or platform data. This patch calls it even if the base is
not already known so that gpiochip_add can attempt to find a usable base.
Signed-off-by: Daniel M. Weeks <dan@danweeks.net>
Acked-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpio-mcp23s08.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c index 6a4470b84488..87ed6bf6528b 100644 --- a/drivers/gpio/gpio-mcp23s08.c +++ b/drivers/gpio/gpio-mcp23s08.c @@ -520,14 +520,13 @@ static int mcp230xx_probe(struct i2c_client *client, match = of_match_device(of_match_ptr(mcp23s08_i2c_of_match), &client->dev); - if (match) { + pdata = client->dev.platform_data; + if (match || !pdata) { base = -1; pullups = 0; } else { - pdata = client->dev.platform_data; - if (!pdata || !gpio_is_valid(pdata->base)) { - dev_dbg(&client->dev, - "invalid or missing platform data\n"); + if (!gpio_is_valid(pdata->base)) { + dev_dbg(&client->dev, "invalid platform data\n"); return -EINVAL; } base = pdata->base; |