---

yaml --- r: 331447 b: refs/heads/master c: 191d5ec h: refs/heads/master i: 331445: 6e2246a 331443: 00057e5 331439: 6a64662 v: v3
git-mirror · Oct 4, 2012 · da4ed3e · da4ed3e
1 parent 3bf2aa9
commit da4ed3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3676d24a8e515be6f22d75957674905fa84d41a0
+refs/heads/master: 191d5eca2405b58cece0e572f694abd1230b0efe
diff --git a/trunk/arch/microblaze/kernel/reset.c b/trunk/arch/microblaze/kernel/reset.c
@@ -28,6 +28,7 @@ void of_platform_reset_gpio_probe(void)
 	if (!gpio_is_valid(handle)) {
 		printk(KERN_INFO "Skipping unavailable RESET gpio %d (%s)\n",
 				handle, "reset");
+		return;
 	}
 
 	ret = gpio_request(handle, "reset");
@@ -60,7 +61,10 @@ void of_platform_reset_gpio_probe(void)
 
 static void gpio_system_reset(void)
 {
-	gpio_set_value(handle, 1 - reset_val);
+	if (gpio_is_valid(handle))
+		gpio_set_value(handle, 1 - reset_val);
+	else
+		pr_notice("Reset GPIO unavailable - halting!\n");
 }
 #else
 #define gpio_system_reset() do {} while (0)
@@ -74,7 +78,6 @@ void machine_restart(char *cmd)
 {
 	printk(KERN_NOTICE "Machine restart...\n");
 	gpio_system_reset();
-	dump_stack();
 	while (1)
 		;
 }