diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /drivers/gpio/max7301.c | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'drivers/gpio/max7301.c')
| -rw-r--r-- | drivers/gpio/max7301.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c index 8b24d784db93..3e7f4e06386e 100644 --- a/drivers/gpio/max7301.c +++ b/drivers/gpio/max7301.c | |||
| @@ -217,8 +217,10 @@ static int __devinit max7301_probe(struct spi_device *spi) | |||
| 217 | int i, ret; | 217 | int i, ret; |
| 218 | 218 | ||
| 219 | pdata = spi->dev.platform_data; | 219 | pdata = spi->dev.platform_data; |
| 220 | if (!pdata || !pdata->base) | 220 | if (!pdata || !pdata->base) { |
| 221 | return -ENODEV; | 221 | dev_dbg(&spi->dev, "incorrect or missing platform data\n"); |
| 222 | return -EINVAL; | ||
| 223 | } | ||
| 222 | 224 | ||
| 223 | /* | 225 | /* |
| 224 | * bits_per_word cannot be configured in platform data | 226 | * bits_per_word cannot be configured in platform data |