From 0fd5b61ceccc9a87e5a2555a21faa1ee4378722d Mon Sep 17 00:00:00 2001
From: Arnaud Patard <apatard@mandriva.com>
Date: Fri, 25 Jul 2008 01:46:00 -0700
Subject: [PATCH] --- yaml --- r: 105824 b: refs/heads/master c:
 60e540d617b40eb3d37f1dd99c97af588ff9b70b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mfd/sm501.c   | 6 ++++--
 trunk/include/linux/sm501.h | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6eaa6ae18815..f5263345c5c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f61be273d3699d174bc1438e6804f9f9e52bb932
+refs/heads/master: 60e540d617b40eb3d37f1dd99c97af588ff9b70b
diff --git a/trunk/drivers/mfd/sm501.c b/trunk/drivers/mfd/sm501.c
index be8713908125..c3e5a48f6148 100644
--- a/trunk/drivers/mfd/sm501.c
+++ b/trunk/drivers/mfd/sm501.c
@@ -996,12 +996,13 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
 {
 	struct sm501_platdata *pdata = sm->platdata;
 	struct gpio_chip *gchip = &chip->gpio;
-	unsigned base = pdata->gpio_base;
+	int base = pdata->gpio_base;
 
 	memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip));
 
 	if (chip == &gpio->high) {
-		base += 32;
+		if (base > 0)
+			base += 32;
 		chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH;
 		gchip->label  = "SM501-HIGH";
 	} else {
@@ -1452,6 +1453,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = {
 static struct sm501_platdata sm501_pci_platdata = {
 	.init		= &sm501_pci_initdata,
 	.fb		= &sm501_fb_pdata,
+	.gpio_base	= -1,
 };
 
 static int sm501_pci_probe(struct pci_dev *dev,
diff --git a/trunk/include/linux/sm501.h b/trunk/include/linux/sm501.h
index 6ea39007c8a3..a8d02f36ad32 100644
--- a/trunk/include/linux/sm501.h
+++ b/trunk/include/linux/sm501.h
@@ -156,7 +156,7 @@ struct sm501_platdata {
 	struct sm501_platdata_fb	*fb;
 
 	int				 flags;
-	unsigned			 gpio_base;
+	int				 gpio_base;
 
 	int	(*get_power)(struct device *dev);
 	int	(*set_power)(struct device *dev, unsigned int on);