summary refs log tree commit diff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorMark Zhan <rongkai.zhan@windriver.com>2007-07-31 00:39:47 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 15:39:44 -0700
commit0439208a8a399f0c4307c561d97e3f5523f5d085 (patch)
tree808ded904316dc65e77e34666f01fe78957c79ef /drivers/rtc
parentbb35fb20b591833fe4205def1338e0e808be3216 (diff)
downloadlinux-0439208a8a399f0c4307c561d97e3f5523f5d085.tar.gz
rtc-m48t59 driver NO_IRQ mode fixup
Since irq in m48t59_private struct is defined as 'unsigned int', which will
make the following if sentence to be never true:

         if (m48t59->irq < 0)
                  m48t59->irq = NO_IRQ;

And thus it will make the m48t59_rtc_probe() is failed when the driver is
working in a no irq mode:

Signed-off-by: Mark Zhan <rongkai.zhan@windriver.com>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-m48t59.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 33b752350ab5..bf60d35f580b 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -35,7 +35,7 @@
 struct m48t59_private {
 	void __iomem *ioaddr;
 	unsigned int size; /* iomem size */
-	unsigned int irq;
+	int irq;
 	struct rtc_device *rtc;
 	spinlock_t lock; /* serialize the NVRAM and RTC access */
 };