From b67ac6ff9d4424caea176a309406e9a6c298cefb Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Wed, 8 Jul 2009 12:04:43 +0000 Subject: [PATCH] --- yaml --- r: 155587 b: refs/heads/master c: c03c2a87347b849ec927d7d2ea79a6955e19f492 h: refs/heads/master i: 155585: 65c50f8dfdc256e81c637ed2c0c34bb0b5e1b3ba 155583: 39cc9111a0721c1ca31e520a25f9b0678697186f v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/bfin_gpio.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a7ec08de908d..0e38a4aa5fd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c94c3e09adba9718218d6e3d35b2dfae81f3911 +refs/heads/master: c03c2a87347b849ec927d7d2ea79a6955e19f492 diff --git a/trunk/arch/blackfin/kernel/bfin_gpio.c b/trunk/arch/blackfin/kernel/bfin_gpio.c index beffa00a93c3..6b9446271371 100644 --- a/trunk/arch/blackfin/kernel/bfin_gpio.c +++ b/trunk/arch/blackfin/kernel/bfin_gpio.c @@ -686,14 +686,12 @@ void bfin_gpio_pm_hibernate_restore(void) *port_fer[bank] = gpio_bank_saved[bank].fer; #endif gpio_array[bank]->inen = gpio_bank_saved[bank].inen; + gpio_array[bank]->data_set = gpio_bank_saved[bank].data + & gpio_bank_saved[bank].dir; gpio_array[bank]->dir = gpio_bank_saved[bank].dir; gpio_array[bank]->polar = gpio_bank_saved[bank].polar; gpio_array[bank]->edge = gpio_bank_saved[bank].edge; gpio_array[bank]->both = gpio_bank_saved[bank].both; - - gpio_array[bank]->data_set = gpio_bank_saved[bank].data - | gpio_bank_saved[bank].dir; - gpio_array[bank]->maska = gpio_bank_saved[bank].maska; } AWA_DUMMY_READ(maska);