Merge commit 'v2.6.29-rc1' into x86/urgent

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index aaf9d6a337cc..1c3fc6b428e9 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
+#include <linux/log2.h>
 #include <asm/rtc.h>
 
 #define DRV_NAME        "sh-rtc"
@@ -89,7 +90,9 @@ struct sh_rtc {
         void __iomem *regbase;
         unsigned long regsize;
         struct resource *res;
-        unsigned int alarm_irq, periodic_irq, carry_irq;
+        int alarm_irq;
+        int periodic_irq;
+        int carry_irq;
         struct rtc_device *rtc_dev;
         spinlock_t lock;
         unsigned long capabilities;     /* See asm-sh/rtc.h for cap bits */
@@ -549,6 +552,8 @@ static int sh_rtc_irq_set_state(struct device *dev, int enabled)
 
 static int sh_rtc_irq_set_freq(struct device *dev, int freq)
 {
+        if (!is_power_of_2(freq))
+                return -EINVAL;
         return sh_rtc_ioctl(dev, RTC_IRQP_SET, freq);
 }
 
@@ -578,7 +583,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
 
         /* get periodic/carry/alarm irqs */
         ret = platform_get_irq(pdev, 0);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for period\n");
                 goto err_badres;
@@ -586,7 +591,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
         rtc->periodic_irq = ret;
 
         ret = platform_get_irq(pdev, 1);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for carry\n");
                 goto err_badres;
@@ -594,7 +599,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
         rtc->carry_irq = ret;
 
         ret = platform_get_irq(pdev, 2);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for alarm\n");
                 goto err_badres;