Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-omap.c

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index ab5035b..35971a3 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1157,11 +1157,9 @@ static int omap_gpio_probe(struct platform_device *pdev)
        if (!pdata)
                return -EINVAL;
 
-       bank = devm_kzalloc(dev, sizeof(struct gpio_bank), GFP_KERNEL);
-       if (!bank) {
-               dev_err(dev, "Memory alloc failed\n");
+       bank = devm_kzalloc(dev, sizeof(*bank), GFP_KERNEL);
+       if (!bank)
                return -ENOMEM;
-       }
 
        irqc = devm_kzalloc(dev, sizeof(*irqc), GFP_KERNEL);
        if (!irqc)