diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /drivers/gpio/mcp23s08.c | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
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) |