Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / mfd / db8500-prcmu.c

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index e996d11980faf9bf0ad9437160f73cbc41a5a966..a25ab9c6b5afe81492c6a2d411e01acaf5aaa8d7 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -1763,7 +1763,7 @@ retry:
 
        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 @@ retry:
                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__);
        }