Commit:     6cd8fa87fbf31b2ab77b8aaec497e7f6a3757578
Parent:     926b28984da035ac407e6b8f22ee8b4f94f51cf1
Author:     Matthew Garrett <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 1 00:46:51 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jun 1 08:18:29 2007 -0700

    RTC: use fallback IRQ if PNP tables don't provide one
    Intel Macs (and possibly other machines) provide a PNP entry for the RTC,
    but provide no IRQ.  As a result the rtc-cmos driver doesn't allow wakeup
    alarms.  If the RTC is located at the legacy ioport range, assume that it's
    on IRQ 8 unless the tables say otherwise.
    Signed-off-by: Matthew Garrett <[EMAIL PROTECTED]>
    Signed-off-by: David Brownell <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/rtc/rtc-cmos.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 6085261..e24ea82 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -641,9 +641,16 @@ cmos_pnp_probe(struct pnp_dev *pnp, const struct 
pnp_device_id *id)
         * drivers can't provide shutdown() methods to disable IRQs.
         * Or better yet, fix PNP to allow those methods...
-       return cmos_do_probe(&pnp->dev,
-                       &pnp->res.port_resource[0],
-                       pnp->res.irq_resource[0].start);
+       if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
+               /* Some machines contain a PNP entry for the RTC, but
+                * don't define the IRQ. It should always be safe to
+                * hardcode it in these cases
+                */
+               return cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8);
+       else
+               return cmos_do_probe(&pnp->dev,
+                                    &pnp->res.port_resource[0],
+                                    pnp->res.irq_resource[0].start);
 static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to