]> Pileus Git - ~andy/linux/commitdiff
rtc-m48t59 driver NO_IRQ mode fixup
authorMark Zhan <rongkai.zhan@windriver.com>
Tue, 31 Jul 2007 07:39:47 +0000 (00:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 22:39:44 +0000 (15:39 -0700)
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>
drivers/rtc/rtc-m48t59.c

index 33b752350ab5c91b708eda96cbff4df7b5d53f2c..bf60d35f580b55e98495af3e6c7ab8157135be78 100644 (file)
@@ -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 */
 };