1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index 1a4d04664d6d..aa266e1f69b2 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -286,7 +286,7 @@ 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", (u32)res->start, ei->base_addr);
@@ -307,7 +307,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;
         }