From ad17897d779977ba1207726cc47e90654bffb332 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 10 Oct 2009 20:55:08 +0200 Subject: glamo-core: Properly initalize irq_base --- drivers/mfd/glamo/glamo-core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index d35d177ff5c..90a193fe21b 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -912,13 +912,20 @@ static int __devinit glamo_probe(struct platform_device *pdev) spin_lock_init(&glamo->lock); glamo->pdev = pdev; - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); glamo->irq = platform_get_irq(pdev, 0); + glamo->irq_base = platform_get_irq(pdev, 1); glamo->pdata = pdev->dev.platform_data; if (glamo->irq < 0) { + ret = glamo->irq; dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret); + goto err_free; + } + + if (glamo->irq_base < 0) { ret = glamo->irq; + dev_err(&pdev->dev, "Failed to get glamo irq base: %d\n", ret); goto err_free; } -- cgit v1.2.3