Merge branch 'topic/jack' into for-linus

[safe/jmp/linux-2.6] / drivers / mfd / htc-egpio.c

diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index ad3379f..d3e74f8 100644 (file)
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mfd/htc-egpio.h>
 
@@ -108,7 +109,7 @@ static void egpio_handler(unsigned int irq, struct irq_desc *desc)
        ack_irqs(ei);
        /* Process all set pins. */
        readval &= ei->irqs_enabled;
-       for_each_bit(irqpin, &readval, ei->nirqs) {
+       for_each_set_bit(irqpin, &readval, ei->nirqs) {
                /* Run irq handler */
                pr_debug("got IRQ %d\n", irqpin);
                irq = ei->irq_start + irqpin;
@@ -286,10 +287,10 @@ static int __init egpio_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
                goto fail;
-       ei->base_addr = ioremap_nocache(res->start, res->end - res->start);
+       ei->base_addr = ioremap_nocache(res->start, resource_size(res));
        if (!ei->base_addr)
                goto fail;
-       pr_debug("EGPIO phys=%08x virt=%p\n", res->start, ei->base_addr);
+       pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
 
        if ((pdata->bus_width != 16) && (pdata->bus_width != 32))
                goto fail;
@@ -307,7 +308,7 @@ static int __init egpio_probe(struct platform_device *pdev)
 
        ei->nchips = pdata->num_chips;
        ei->chip = kzalloc(sizeof(struct egpio_chip) * ei->nchips, GFP_KERNEL);
-       if (!ei) {
+       if (!ei->chip) {
                ret = -ENOMEM;
                goto fail;
        }