patch-2.4.0-test9 linux/arch/ppc/kernel/pmac_nvram.c

• Lines: 44
• Date: Sun Sep 17 09:48:07 2000
• Orig file: v2.4.0-test8/linux/arch/ppc/kernel/pmac_nvram.c
• Orig date: Thu Jul 13 09:42:50 2000

diff -u --recursive --new-file v2.4.0-test8/linux/arch/ppc/kernel/pmac_nvram.c linux/arch/ppc/kernel/pmac_nvram.c
@@ -312,17 +312,18 @@
 __openfirmware
 unsigned char nvram_read_byte(int addr)
 {
-	struct adb_request req;
-
 	switch (nvram_naddrs) {
 #ifdef CONFIG_ADB_PMU
-	case -1:
+	case -1: {
+		struct adb_request req;
+
 		if (pmu_request(&req, NULL, 3, PMU_READ_NVRAM,
 				(addr >> 8) & 0xff, addr & 0xff))
 			break;
 		while (!req.complete)
 			pmu_poll();
 		return req.reply[1];
+	}
 #endif
 	case 1:
 		if (is_core_99)
@@ -339,17 +340,18 @@
 __openfirmware
 void nvram_write_byte(unsigned char val, int addr)
 {
-	struct adb_request req;
-
 	switch (nvram_naddrs) {
 #ifdef CONFIG_ADB_PMU
-	case -1:
+	case -1: {
+		struct adb_request req;
+
 		if (pmu_request(&req, NULL, 4, PMU_WRITE_NVRAM,
 				(addr >> 8) & 0xff, addr & 0xff, val))
 			break;
 		while (!req.complete)
 			pmu_poll();
 		break;
+	}
 #endif
 	case 1:
 		if (is_core_99) {