Merge tag 'mmc-merge-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / mmc / host / sdhci-tegra.c

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index d43e7462941fbd24bdecdb1063b8b4501a53bee8..84e8d0c59ee5673721d5637c49b81c4742fab5d1 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -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))