From d081bb607950381ae007111fcb4cabc6d36290f0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 27 Jun 2011 17:23:48 -0400 Subject: [PATCH] --- yaml --- r: 257903 b: refs/heads/master c: fdfb0becea3be2edf4200c4ea8cf8b6fe9daa89a h: refs/heads/master i: 257901: e6adfa7de82b07450c474933579dc05df2645e17 257899: 534e5a50a6e1a28d284a07489a76076ea24f291b 257895: 353c372f7d1754724745c0a5b04c52a8cae64209 257887: 0b573ca618efd0d8377f64a28140d829c4678d0d v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/bfin_gpio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54d5bfab223f..468d63ce4554 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e770f77801fce713f5736c66f8441467eb36db5 +refs/heads/master: fdfb0becea3be2edf4200c4ea8cf8b6fe9daa89a diff --git a/trunk/arch/blackfin/kernel/bfin_gpio.c b/trunk/arch/blackfin/kernel/bfin_gpio.c index 16d7ebfa0db1..02796b88443d 100644 --- a/trunk/arch/blackfin/kernel/bfin_gpio.c +++ b/trunk/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