Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 350504
b: refs/heads/master
c: d41e35c
h: refs/heads/master
v: v3
  • Loading branch information
Lee Jones authored and Linus Walleij committed Feb 5, 2013
1 parent 08585f8 commit fc43e5a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83b423c885337415a680748cbd40f732734ab0b1
refs/heads/master: d41e35c364391d5c80467f62eecec8c4c65342f4
3 changes: 3 additions & 0 deletions trunk/drivers/pinctrl/pinctrl-abx500.c
Original file line number Diff line number Diff line change
Expand Up @@ -1155,11 +1155,13 @@ static int abx500_gpio_probe(struct platform_device *pdev)
default:
dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n",
(int) platid->driver_data);
mutex_destroy(&pct->lock);
return -EINVAL;
}

if (!pct->soc) {
dev_err(&pdev->dev, "Invalid SOC data\n");
mutex_destroy(&pct->lock);
return -EINVAL;
}

Expand All @@ -1176,6 +1178,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
ret = gpiochip_add(&pct->chip);
if (ret) {
dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
mutex_destroy(&pct->lock);
goto out_rem_irq;
}
dev_info(&pdev->dev, "added gpiochip\n");
Expand Down

0 comments on commit fc43e5a

Please sign in to comment.