diff options
Diffstat (limited to 'drivers/mfd/sm501.c')
-rw-r--r-- | drivers/mfd/sm501.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index be8713908125..c3e5a48f6148 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -996,12 +996,13 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm, | |||
996 | { | 996 | { |
997 | struct sm501_platdata *pdata = sm->platdata; | 997 | struct sm501_platdata *pdata = sm->platdata; |
998 | struct gpio_chip *gchip = &chip->gpio; | 998 | struct gpio_chip *gchip = &chip->gpio; |
999 | unsigned base = pdata->gpio_base; | 999 | int base = pdata->gpio_base; |
1000 | 1000 | ||
1001 | memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip)); | 1001 | memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip)); |
1002 | 1002 | ||
1003 | if (chip == &gpio->high) { | 1003 | if (chip == &gpio->high) { |
1004 | base += 32; | 1004 | if (base > 0) |
1005 | base += 32; | ||
1005 | chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH; | 1006 | chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH; |
1006 | gchip->label = "SM501-HIGH"; | 1007 | gchip->label = "SM501-HIGH"; |
1007 | } else { | 1008 | } else { |
@@ -1452,6 +1453,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = { | |||
1452 | static struct sm501_platdata sm501_pci_platdata = { | 1453 | static struct sm501_platdata sm501_pci_platdata = { |
1453 | .init = &sm501_pci_initdata, | 1454 | .init = &sm501_pci_initdata, |
1454 | .fb = &sm501_fb_pdata, | 1455 | .fb = &sm501_fb_pdata, |
1456 | .gpio_base = -1, | ||
1455 | }; | 1457 | }; |
1456 | 1458 | ||
1457 | static int sm501_pci_probe(struct pci_dev *dev, | 1459 | static int sm501_pci_probe(struct pci_dev *dev, |