Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332812
b: refs/heads/master
c: b37f9d9
h: refs/heads/master
v: v3
  • Loading branch information
Joseph Lo authored and Chris Ball committed Sep 4, 2012
1 parent def2acf commit 3778530
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: abe1e05da365350ac282ba5f6831aae13d97074e
refs/heads/master: b37f9d98f3d28ad98cc6c1894159312914f49190
7 changes: 3 additions & 4 deletions trunk/drivers/mmc/host/sdhci-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,9 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
int rc;

match = of_match_device(sdhci_tegra_dt_match, &pdev->dev);
if (match)
soc_data = match->data;
else
soc_data = &soc_data_tegra20;
if (!match)
return -EINVAL;
soc_data = match->data;

host = sdhci_pltfm_init(pdev, soc_data->pdata);
if (IS_ERR(host))
Expand Down

0 comments on commit 3778530

Please sign in to comment.