diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/gpio/mcp23s08.c | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/gpio/mcp23s08.c')
| -rw-r--r-- | drivers/gpio/mcp23s08.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c index 89c1d222e9d1..f6fae0e50e65 100644 --- a/drivers/gpio/mcp23s08.c +++ b/drivers/gpio/mcp23s08.c | |||
| @@ -310,8 +310,10 @@ static int mcp23s08_probe(struct spi_device *spi) | |||
| 310 | unsigned base; | 310 | unsigned base; |
| 311 | 311 | ||
| 312 | pdata = spi->dev.platform_data; | 312 | pdata = spi->dev.platform_data; |
| 313 | if (!pdata || !gpio_is_valid(pdata->base)) | 313 | if (!pdata || !gpio_is_valid(pdata->base)) { |
| 314 | return -ENODEV; | 314 | dev_dbg(&spi->dev, "invalid or missing platform data\n"); |
| 315 | return -EINVAL; | ||
| 316 | } | ||
| 315 | 317 | ||
| 316 | for (addr = 0; addr < 4; addr++) { | 318 | for (addr = 0; addr < 4; addr++) { |
| 317 | if (!pdata->chip[addr].is_present) | 319 | if (!pdata->chip[addr].is_present) |