diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /drivers/gpio/gpio-rcar.c | |
| parent | 33e0aae11e4854c792e9871f94da6d28bf2e2bb8 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'drivers/gpio/gpio-rcar.c')
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 28fa94a316ff..2fdd0191819d 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c | |||
| @@ -421,7 +421,7 @@ static int gpio_rcar_probe(struct platform_device *pdev) | |||
| 421 | if (!p->irq_domain) { | 421 | if (!p->irq_domain) { |
| 422 | ret = -ENXIO; | 422 | ret = -ENXIO; |
| 423 | dev_err(&pdev->dev, "cannot initialize irq domain\n"); | 423 | dev_err(&pdev->dev, "cannot initialize irq domain\n"); |
| 424 | goto err1; | 424 | goto err0; |
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | if (devm_request_irq(&pdev->dev, irq->start, | 427 | if (devm_request_irq(&pdev->dev, irq->start, |