From da4ed3e9e4c241bec2d172aab2e44481b241b9db Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 20 Jun 2012 22:36:37 +0200 Subject: [PATCH] --- yaml --- r: 331447 b: refs/heads/master c: 191d5eca2405b58cece0e572f694abd1230b0efe h: refs/heads/master i: 331445: 6e2246a321e98ddea37841f4a8cc70a9ec0f7e7f 331443: 00057e5fbc72d97383fbc9967a5eb0ecf4663173 331439: 6a6466296401400d66718320682b3ecabd82892d v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/reset.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 384336aad177..63a68c1d915f 100644 --- 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 index 88a01636f785..6ce60fb24ac5 100644 --- 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) ; }