Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[karo-tx-linux.git] / drivers / gpio / max7301.c

diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c
index 8b24d784db93e6bfda3e9b28440c10caab8173fa..7b82eaae26218c6edb6195b06fb414c790db2c44 100644 (file)
--- a/drivers/gpio/max7301.c
+++ b/drivers/gpio/max7301.c
@@ -217,8 +217,10 @@ static int __devinit max7301_probe(struct spi_device *spi)
        int i, ret;
 
        pdata = spi->dev.platform_data;
-       if (!pdata || !pdata->base)
-               return -ENODEV;
+       if (!pdata || !pdata->base) {
+               dev_dbg(&spi->dev, "incorrect or missing platform data\n");
+               return -EINVAL;
+       }
 
        /*
         * bits_per_word cannot be configured in platform data
@@ -285,7 +287,7 @@ exit_destroy:
        return ret;
 }
 
-static int max7301_remove(struct spi_device *spi)
+static int __devexit max7301_remove(struct spi_device *spi)
 {
        struct max7301 *ts;
        int ret;