From 7abd53c17a7839843f1bc8fb402d181e6439828f Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 10 Oct 2011 13:04:44 +0200 Subject: [PATCH] --- yaml --- r: 273436 b: refs/heads/master c: 57265bc114fd71e721a314f481902cd4f4d3d05f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/db8500-prcmu.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 83e4088b376e..532cd13a0bbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e62ccf3a7a21d62d92520f47ba5bd7e2112d8c1b +refs/heads/master: 57265bc114fd71e721a314f481902cd4f4d3d05f diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c index e996d11980fa..a25ab9c6b5af 100644 --- a/trunk/drivers/mfd/db8500-prcmu.c +++ b/trunk/drivers/mfd/db8500-prcmu.c @@ -1763,7 +1763,7 @@ void prcmu_ac_wake_req(void) if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, msecs_to_jiffies(5000))) { - panic("prcmu: %s timed out (5 s) waiting for a reply.\n", + pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n", __func__); goto unlock_and_return; } @@ -1785,7 +1785,7 @@ void prcmu_ac_wake_req(void) if (wait_for_completion_timeout(&mb0_transfer.ac_wake_work, msecs_to_jiffies(5000))) goto retry; - panic("prcmu: %s timed out (5 s) waiting for AC_SLEEP_ACK.\n", + pr_crit("prcmu: %s timed out (5 s) waiting for AC_SLEEP_ACK.\n", __func__); } @@ -1811,7 +1811,7 @@ void prcmu_ac_sleep_req() if (!wait_for_completion_timeout(&mb0_transfer.ac_wake_work, msecs_to_jiffies(5000))) { - panic("prcmu: %s timed out (5 s) waiting for a reply.\n", + pr_crit("prcmu: %s timed out (5 s) waiting for a reply.\n", __func__); }