diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-10 20:55:08 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-06 08:46:43 +0100 |
| commit | c52c9c2ce66b7d450b1dd7ca941ab4bc0eb0e477 (patch) | |
| tree | 3f07e6ac3ede696479307156df001aa7050d7767 /drivers | |
| parent | f80843a39a47066857363de4270f3c23495095f4 (diff) | |
glamo-core: Properly initalize irq_base
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 9 |
1 files changed, 8 insertions, 1 deletions
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; } |