Merge branch 'master' into devel

This commit is contained in:
Russell King 2009-09-12 12:04:37 +01:00 • committed by Russell King
commit 87d721ad7a
908 changed files with 12536 additions and 7059 deletions

View file

@ -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);