]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/linux-2.6.40-pandaboard-rtc-twl-irq.patch
Merge remote-tracking branch 'origin/next' into kernel-update
[people/teissler/ipfire-2.x.git] / src / patches / linux-2.6.40-pandaboard-rtc-twl-irq.patch
1 diff -Naur linux-3.0.24.org/drivers/rtc/rtc-twl.c linux-3.0.24/drivers/rtc/rtc-twl.c
2 --- linux-3.0.24.org/drivers/rtc/rtc-twl.c 2012-03-12 18:58:19.000000000 +0100
3 +++ linux-3.0.24/drivers/rtc/rtc-twl.c 2012-03-20 23:24:52.213578926 +0100
4 @@ -362,14 +362,6 @@
5 int res;
6 u8 rd_reg;
7
8 -#ifdef CONFIG_LOCKDEP
9 - /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
10 - * we don't want and can't tolerate. Although it might be
11 - * friendlier not to borrow this thread context...
12 - */
13 - local_irq_enable();
14 -#endif
15 -
16 res = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
17 if (res)
18 goto out;
19 @@ -462,7 +454,7 @@
20 if (ret < 0)
21 goto out1;
22
23 - ret = request_irq(irq, twl_rtc_interrupt,
24 + ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt,
25 IRQF_TRIGGER_RISING,
26 dev_name(&rtc->dev), rtc);
27 if (ret < 0) {