summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAnish Trivedi <anish@freescale.com>2010-03-17 13:45:34 -0500
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:17:23 +0200
commitcfd568c81b246f5adca17a84ceaeaff03f558d41 (patch)
treecefbbf4c853a822cadbb573ad3189aa590bda0fe /drivers
parent0d0ebe32c94c81474475bc54577d649de582eaba (diff)
ENGR00121694 SRTC: Running unit test script results in a hang
Replaced disable_irq() call with disable_irq_no_sync() Signed-off-by: Anish Trivedi <anish@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-mxc_v2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c
index 2e886cf2715c..5d410fd9d5d2 100644
--- a/drivers/rtc/rtc-mxc_v2.c
+++ b/drivers/rtc/rtc-mxc_v2.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -257,7 +257,7 @@ static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id)
/* If no interrupts are enabled, turn off interrupts in kernel */
if (((lp_cr & SRTC_LPCR_ALL_INT_EN) == 0) && (pdata->irq_enable)) {
- disable_irq(pdata->irq);
+ disable_irq_nosync(pdata->irq);
pdata->irq_enable = false;
}