rtc: bunch of drivers: fix 'no irq' case handing
This patch fixes a bunch of irq checking misuses. Most drivers were getting irq via platform_get_irq(), which returns -ENXIO or r->start. rtc-cmos.c is special. It is using PNP and platform bindings. Hopefully nobody is using PNP IRQ 0 for RTC. So the changes should be safe. rtc-sh.c is using platform_get_irq, but was storing a result into an unsigned type, then was checking for < 0. This is fixed now. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d4afc76c0b
commit
2fac6674dd
9 changed files with 40 additions and 40 deletions
|
@ -84,8 +84,8 @@ static DEFINE_SPINLOCK(rtc_lock);
|
|||
static char rtc_name[] = "RTC";
|
||||
static unsigned long periodic_count;
|
||||
static unsigned int alarm_enabled;
|
||||
static int aie_irq = -1;
|
||||
static int pie_irq = -1;
|
||||
static int aie_irq;
|
||||
static int pie_irq;
|
||||
|
||||
static inline unsigned long read_elapsed_second(void)
|
||||
{
|
||||
|
@ -360,7 +360,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
|
|||
spin_unlock_irq(&rtc_lock);
|
||||
|
||||
aie_irq = platform_get_irq(pdev, 0);
|
||||
if (aie_irq < 0 || aie_irq >= nr_irqs) {
|
||||
if (aie_irq <= 0) {
|
||||
retval = -EBUSY;
|
||||
goto err_device_unregister;
|
||||
}
|
||||
|
@ -371,7 +371,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
|
|||
goto err_device_unregister;
|
||||
|
||||
pie_irq = platform_get_irq(pdev, 1);
|
||||
if (pie_irq < 0 || pie_irq >= nr_irqs)
|
||||
if (pie_irq <= 0)
|
||||
goto err_free_irq;
|
||||
|
||||
retval = request_irq(pie_irq, rtclong1_interrupt, IRQF_DISABLED,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue