Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336420
b: refs/heads/master
c: 8035720
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Linus Walleij committed Nov 15, 2012
1 parent 5d5c762 commit 1215142
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4484d0b17982af8d7af2c21bcc67e47f4237ce70
refs/heads/master: 80357203ec68a2c8ebcb61d2cebdf02d10369af1
6 changes: 4 additions & 2 deletions trunk/drivers/pinctrl/pinctrl-coh901.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,8 +752,10 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
U300_GPIO_PINS_PER_PORT,
&irq_domain_simple_ops,
port);
if (!port->domain)
if (!port->domain) {
err = -ENOMEM;
goto err_no_domain;
}

irq_set_chained_handler(port->irq, u300_gpio_irq_handler);
irq_set_handler_data(port->irq, port);
Expand Down Expand Up @@ -801,7 +803,7 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
err_no_port:
u300_gpio_free_ports(gpio);
clk_disable_unprepare(gpio->clk);
dev_info(&pdev->dev, "module ERROR:%d\n", err);
dev_err(&pdev->dev, "module ERROR:%d\n", err);
return err;
}

Expand Down

0 comments on commit 1215142

Please sign in to comment.