git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sdhci-pci.c
diff --git
a/drivers/mmc/host/sdhci-pci.c
b/drivers/mmc/host/sdhci-pci.c
index
6701af6
..
65483fd
100644
(file)
--- a/
drivers/mmc/host/sdhci-pci.c
+++ b/
drivers/mmc/host/sdhci-pci.c
@@
-628,7
+628,7
@@
static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot));
if (IS_ERR(host)) {
dev_err(&pdev->dev, "cannot allocate host\n");
- return ERR_
PTR(PTR_ERR(host)
);
+ return ERR_
CAST(host
);
}
slot = sdhci_priv(host);