diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/gpio/mcp23s08.c | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into next
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) |