diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 12:04:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 12:04:37 +0100 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/mmc | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
| download | kernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.zip kernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.gz kernel_samsung_crespo-87d721ad7a37b7650dd710c88dd5c6a5bf9fe996.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/mmc')
| -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 9088443..1e8aa590 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, return -ENODEV; host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host)); - if (!host) + if (IS_ERR(host)) return -ENOMEM; of_host = sdhci_priv(host); |