diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /drivers/gpio/max7301.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/hda
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 |