From 409a53d655b8e4a2c89c9b1bc5dba23694ca8dd3 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 9 Aug 2010 23:51:44 +0400
Subject: [PATCH] --- yaml --- r: 219674 b: refs/heads/master c:
 036b00e0917a867a018c583aa86aa66affb9321c h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/crystalhd/crystalhd_lnx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 95c2a1de9383..d7b5e613bdc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6cdc4056f642884d6819597c315753264e305a1
+refs/heads/master: 036b00e0917a867a018c583aa86aa66affb9321c
diff --git a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
index fbb80f09a3d9..115e79b8b4eb 100644
--- a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -570,6 +570,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;
 	}