Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312842
b: refs/heads/master
c: 0fc81ee
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Chris Ball committed Jul 22, 2012
1 parent c23fe3d commit f51e423
Show file tree
Hide file tree
Showing 2 changed files with 9 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: b9929f0eb466089e14389a7d467196c4e179dc6a
refs/heads/master: 0fc81ee3102efedd4571e28372d2242c694c67ec
10 changes: 8 additions & 2 deletions trunk/drivers/mmc/host/sdhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -3033,8 +3033,11 @@ int sdhci_add_host(struct sdhci_host *host)

ret = request_irq(host->irq, sdhci_irq, IRQF_SHARED,
mmc_hostname(mmc), host);
if (ret)
if (ret) {
pr_err("%s: Failed to request IRQ %d: %d\n",
mmc_hostname(mmc), host->irq, ret);
goto untasklet;
}

sdhci_init(host, 0);

Expand All @@ -3051,8 +3054,11 @@ int sdhci_add_host(struct sdhci_host *host)
host->led.brightness_set = sdhci_led_control;

ret = led_classdev_register(mmc_dev(mmc), &host->led);
if (ret)
if (ret) {
pr_err("%s: Failed to register LED device: %d\n",
mmc_hostname(mmc), ret);
goto reset;
}
#endif

mmiowb();
Expand Down

0 comments on commit f51e423

Please sign in to comment.