diff options
| author | merging other branches <null@invalid> | 2008-11-26 16:07:01 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-26 16:07:01 +0000 |
| commit | 6d2c293d6578048e7b71e0c44897144f15f350ae (patch) | |
| tree | cba36be2a06ee7bfa0aab1a3c7d36bd67ea37402 /drivers/mfd/pcf50633-gpio.c | |
| parent | 524f4a1dfe71a8b353a244140164e09828abb68c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean
balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266
Diffstat (limited to 'drivers/mfd/pcf50633-gpio.c')
| -rw-r--r-- | drivers/mfd/pcf50633-gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/pcf50633-gpio.c b/drivers/mfd/pcf50633-gpio.c index a5b978c4e3c..a7117fa6282 100644 --- a/drivers/mfd/pcf50633-gpio.c +++ b/drivers/mfd/pcf50633-gpio.c @@ -5,7 +5,7 @@ * All rights reserved. * * Broken down from monstrous PCF50633 driver mainly by - * Harald Welte and Andy Green + * Harald Welte, Andy Green and Werner Almesberger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -30,7 +30,7 @@ void pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, int val) { u8 reg; - + reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG; pcf50633_reg_set_bit_mask(pcf, reg, 0x07, val); @@ -91,7 +91,7 @@ void pcf50633_gpio_power_supply_set(struct pcf50633 *pcf, /* the *ENA register is always one after the *OUT register */ reg = pcf50633_regulator_registers[regulator] + 1; - + val = (!!on << (gpio - PCF50633_GPIO1)); pcf50633_reg_set_bit_mask(pcf, reg, val, val); |