From 2686a799308073c23ba66dafb4c10f1188b81c21 Mon Sep 17 00:00:00 2001
From: Roland Stigge <stigge@antcom.de>
Date: Thu, 15 Nov 2012 14:59:40 +0100
Subject: [PATCH] --- yaml --- r: 336831 b: refs/heads/master c:
 8754fccbae661a0020923cffd63e21de36d51e2e h: refs/heads/master i:   336829:
 4c5276b55f213cc85b90cbcbb3e35f5e5f33f122   336827:
 4b05dd8ccc1f7b823ff92df845a18c315390432e   336823:
 f9b02f62095d5d5daa761075ffa301c1b7187000   336815:
 77fb1bdc45f20278092706b68b3054eb9e285b6f   336799:
 f81512963820154e5c3b648d05126b5f8c926e31   336767:
 2bedc832e08c4d723644e56a424ddf68d410d97f v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/gpio/gpio-max730x.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fee0612124d9..f55dd6352e3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9859eb99e9212339e2009b98c396b08260276edf
+refs/heads/master: 8754fccbae661a0020923cffd63e21de36d51e2e
diff --git a/trunk/drivers/gpio/gpio-max730x.c b/trunk/drivers/gpio/gpio-max730x.c
index 05e2dac60b3b..c4bf86abd4d8 100644
--- a/trunk/drivers/gpio/gpio-max730x.c
+++ b/trunk/drivers/gpio/gpio-max730x.c
@@ -167,10 +167,6 @@ int __devinit __max730x_probe(struct max7301 *ts)
 	int i, ret;
 
 	pdata = dev->platform_data;
-	if (!pdata || !pdata->base) {
-		dev_err(dev, "incorrect or missing platform data\n");
-		return -EINVAL;
-	}
 
 	mutex_init(&ts->lock);
 	dev_set_drvdata(dev, ts);
@@ -178,7 +174,12 @@ int __devinit __max730x_probe(struct max7301 *ts)
 	/* Power up the chip and disable IRQ output */
 	ts->write(dev, 0x04, 0x01);
 
-	ts->input_pullup_active = pdata->input_pullup_active;
+	if (pdata) {
+		ts->input_pullup_active = pdata->input_pullup_active;
+		ts->chip.base = pdata->base;
+	} else {
+		ts->chip.base = -1;
+	}
 	ts->chip.label = dev->driver->name;
 
 	ts->chip.direction_input = max7301_direction_input;
@@ -186,7 +187,6 @@ int __devinit __max730x_probe(struct max7301 *ts)
 	ts->chip.direction_output = max7301_direction_output;
 	ts->chip.set = max7301_set;
 
-	ts->chip.base = pdata->base;
 	ts->chip.ngpio = PIN_NUMBER;
 	ts->chip.can_sleep = 1;
 	ts->chip.dev = dev;