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 'staging-next' to Linus's tree
[pandora-kernel.git]
/
drivers
/
staging
/
crystalhd
/
crystalhd_lnx.c
diff --git
a/drivers/staging/crystalhd/crystalhd_lnx.c
b/drivers/staging/crystalhd/crystalhd_lnx.c
index
af25899
..
28c6b8c
100644
(file)
--- a/
drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/
drivers/staging/crystalhd/crystalhd_lnx.c
@@
-571,6
+571,7
@@
static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
rc = chd_pci_reserve_mem(pinfo);
if (rc) {
BCMLOG_ERR("Failed to setup memory regions.\n");
+ pci_disable_device(pdev);
return -ENOMEM;
}