Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / crystalhd / crystalhd_lnx.c

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index af258991fe7fc8f653ecc5d862adb8fb59161257..28c6b8ced424cec2e2f3d54ac495f61fda6941da 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;
        }