android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: mcp23s08: Bug fix of SPI device tree registration.

Browse Source 
The chips variable needs to be incremented for each chip that is
found in the spi_present_mask when registering via device tree.
Without this and the checking a negative index is passed to the
data->chip array in a subsequent loop.

Cc: stable@vger.kernel.org
Signed-off-by: Michael Welling <mwelling@ieee.org>
Acked-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Michael Welling 2014-04-16 20:00:24 -05:00 committed by Linus Walleij
parent a7008ee1a4
commit 99e4b98dbe
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/gpio-mcp23s08.c
View File

@ -894,9 +894,11 @@ static int mcp23s08_probe(struct spi_device *spi)
dev_err(&spi->dev, "invalid spi-present-mask\n"); dev_err(&spi->dev, "invalid spi-present-mask\n");
return -ENODEV; return -ENODEV;
} }
for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) if ((spi_present_mask & (1 << addr)))
chips++;
pullups[addr] = 0; pullups[addr] = 0;
}
} else { } else {
type = spi_get_device_id(spi)->driver_data; type = spi_get_device_id(spi)->driver_data;
pdata = dev_get_platdata(&spi->dev); pdata = dev_get_platdata(&spi->dev);
@ -919,12 +921,12 @@ static int mcp23s08_probe(struct spi_device *spi)
pullups[addr] = pdata->chip[addr].pullups; pullups[addr] = pdata->chip[addr].pullups;
} }
if (!chips)
return -ENODEV;
base = pdata->base; base = pdata->base;
} }
if (!chips)
return -ENODEV;
data = kzalloc(sizeof(*data) + chips * sizeof(struct mcp23s08), data = kzalloc(sizeof(*data) + chips * sizeof(struct mcp23s08),
GFP_KERNEL); GFP_KERNEL);
if (!data) if (!data)