From: Mark Zhan <rongkai.zhan@windriver.com>
Date: Tue, 31 Jul 2007 07:39:47 +0000 (-0700)
Subject: rtc-m48t59 driver NO_IRQ mode fixup
X-Git-Tag: v2.6.23-rc2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0439208a8a399f0c4307c561d97e3f5523f5d085;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 33b752350ab..bf60d35f580 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 */
 };