aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/pca953x.c
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2009-01-19 14:00:57 +1100
committerLachlan McIlroy <lachlan@sgi.com>2009-01-19 14:00:57 +1100
commit6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch)
treeb240465c2dadbe0366a5b66d60c4776be1b7670d /drivers/gpio/pca953x.c
parent[XFS] Remove the rest of the macro-to-function indirections. (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff)
downloadlinux-dev-6c5200ce3c528a8f7695ee62f33ad84d8f84d444.tar.xz
linux-dev-6c5200ce3c528a8f7695ee62f33ad84d8f84d444.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpio/pca953x.c')
-rw-r--r--drivers/gpio/pca953x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 37f35388a2ae..8dc0164bd51e 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -202,8 +202,10 @@ static int __devinit pca953x_probe(struct i2c_client *client,
int ret;
pdata = client->dev.platform_data;
- if (pdata == NULL)
- return -ENODEV;
+ if (pdata == NULL) {
+ dev_dbg(&client->dev, "no platform data\n");
+ return -EINVAL;
+ }
chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
if (chip == NULL)