---

yaml --- r: 257903 b: refs/heads/master c: fdfb0be h: refs/heads/master i: 257901: e6adfa7 257899: 534e5a5 257895: 353c372 257887: 0b573ca v: v3
git-mirror · Jul 23, 2011 · d081bb6 · d081bb6
1 parent 9f1381f
commit d081bb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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