Merge branch 'devel' into for-next

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index cd007a67b302..dd262f00295d 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -258,6 +258,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
                 spin_lock_init(&chips[i].lock);
 
                 regs = gpio2regs(base);
+                if (!regs)
+                        return -ENXIO;
                 chips[i].regs = regs;
                 chips[i].set_data = &regs->set_data;
                 chips[i].clr_data = &regs->clr_data;
@@ -433,8 +435,7 @@ static struct irq_chip *davinci_gpio_get_irq_chip(unsigned int irq)
 {
         static struct irq_chip_type gpio_unbanked;
 
-        gpio_unbanked = *container_of(irq_get_chip(irq),
-                                      struct irq_chip_type, chip);
+        gpio_unbanked = *irq_data_get_chip_type(irq_get_irq_data(irq));
 
         return &gpio_unbanked.chip;
 };