diff options
| author | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /drivers/mmc/host/sdhci-of.c | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/mmc/host/sdhci-of.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-of.c b/drivers/mmc/host/sdhci-of.c index 908844327db0..1e8aa590bb39 100644 --- a/drivers/mmc/host/sdhci-of.c +++ b/drivers/mmc/host/sdhci-of.c | |||
| @@ -234,7 +234,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev, | |||
| 234 | return -ENODEV; | 234 | return -ENODEV; |
| 235 | 235 | ||
| 236 | host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host)); | 236 | host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host)); |
| 237 | if (!host) | 237 | if (IS_ERR(host)) |
| 238 | return -ENOMEM; | 238 | return -ENOMEM; |
| 239 | 239 | ||
| 240 | of_host = sdhci_priv(host); | 240 | of_host = sdhci_priv(host); |