You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
730 B
27 lines
730 B
13 years ago
|
--- a/drivers/rtc/rtc-twl.c
|
||
|
|
+++ b/drivers/rtc/rtc-twl.c
|
||
|
|
@@ -362,14 +362,6 @@ static irqreturn_t twl_rtc_interrupt(int
|
||
|
|
int res;
|
||
|
|
u8 rd_reg;
|
||
|
|
|
||
|
|
-#ifdef CONFIG_LOCKDEP
|
||
|
|
- /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
|
||
|
|
- * we don't want and can't tolerate. Although it might be
|
||
|
|
- * friendlier not to borrow this thread context...
|
||
|
|
- */
|
||
|
|
- local_irq_enable();
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
res = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
|
||
|
|
if (res)
|
||
|
|
goto out;
|
||
|
|
@@ -462,7 +454,7 @@ static int __devinit twl_rtc_probe(struc
|
||
|
|
if (ret < 0)
|
||
|
|
goto out1;
|
||
|
|
|
||
|
|
- ret = request_irq(irq, twl_rtc_interrupt,
|
||
|
|
+ ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt,
|
||
|
|
IRQF_TRIGGER_RISING,
|
||
|
|
dev_name(&rtc->dev), rtc);
|
||
|
|
if (ret < 0) {
|