diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-06-27 23:23:48 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-23 07:18:32 +0200 |
| commit | fdfb0becea3be2edf4200c4ea8cf8b6fe9daa89a (patch) | |
| tree | 5430f619f390839ecf31e5f2f969889ecdc76a5a /arch/blackfin | |
| parent | Blackfin: dpmc: optimize SDRAM programming slightly (diff) | |
| download | linux-fdfb0becea3be2edf4200c4ea8cf8b6fe9daa89a.tar.xz linux-fdfb0becea3be2edf4200c4ea8cf8b6fe9daa89a.zip | |
Blackfin: bf54x: fix GPIO resume code
Back in commit c03c2a87347b849ec927d, we fixed logic in the non-bf54x
GPIO resume code to set the data levels properly before the direction
to avoid spurious line glitches. But we missed the bf54x code paths.
So add the same fix there.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 16d7ebfa0db1..02796b88443d 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c @@ -713,9 +713,9 @@ void bfin_gpio_pm_hibernate_restore(void) gpio_array[bank]->port_mux = gpio_bank_saved[bank].mux; gpio_array[bank]->port_fer = gpio_bank_saved[bank].fer; gpio_array[bank]->inen = gpio_bank_saved[bank].inen; - gpio_array[bank]->dir_set = gpio_bank_saved[bank].dir; gpio_array[bank]->data_set = gpio_bank_saved[bank].data - | gpio_bank_saved[bank].dir; + & gpio_bank_saved[bank].dir; + gpio_array[bank]->dir_set = gpio_bank_saved[bank].dir; } } #endif |