From c54621536ff76f4096abe3f6b17c7aa450df39bc Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 5 Aug 2012 11:52:34 +0200 Subject: [PATCH] --- yaml --- r: 321559 b: refs/heads/master c: d6a2b7ba67334a7e72cd153c142c449831557cb9 h: refs/heads/master i: 321557: a5668d879a8ac693d9c64b6895d3024e6ebe0f58 321555: eb807b13eaf191931af8b94576e413c87926688d 321551: 19cd5aa6f4bd71a369d5445b3467490481ec9c11 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-langwell.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf7fff35ba63..fbc3815c9826 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7093f3e7a50bfeeceb8950f9130cbf8af74bf92 +refs/heads/master: d6a2b7ba67334a7e72cd153c142c449831557cb9 diff --git a/trunk/drivers/gpio/gpio-langwell.c b/trunk/drivers/gpio/gpio-langwell.c index a1c8754f52cf..202a99207b7d 100644 --- a/trunk/drivers/gpio/gpio-langwell.c +++ b/trunk/drivers/gpio/gpio-langwell.c @@ -339,7 +339,7 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, resource_size_t start, len; struct lnw_gpio *lnw; u32 gpio_base; - int retval = 0; + int retval; int ngpio = id->driver_data; retval = pci_enable_device(pdev); @@ -357,6 +357,7 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, base = ioremap_nocache(start, len); if (!base) { dev_err(&pdev->dev, "error mapping bar1\n"); + retval = -EFAULT; goto err3; } gpio_base = *((u32 *)base + 1); @@ -381,8 +382,10 @@ static int __devinit lnw_gpio_probe(struct pci_dev *pdev, lnw->domain = irq_domain_add_linear(pdev->dev.of_node, ngpio, &lnw_gpio_irq_ops, lnw); - if (!lnw->domain) + if (!lnw->domain) { + retval = -ENOMEM; goto err3; + } lnw->reg_base = base; lnw->chip.label = dev_name(&pdev->dev);