From 9d103550d6fbb7416aed19dd0e800171045f1007 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Fri, 6 Aug 2010 23:52:57 +0400
Subject: [PATCH] --- yaml --- r: 219683 b: refs/heads/master c:
 c37c6d2196fc716abac6531c4cf08ad2874d52d8 h: refs/heads/master i:   219681:
 3dfb2cdc353ae1cdc533452b0c7c1fde8271ecbb   219679:
 98a1931fe7770c1cde91687393902bc7b2f2ee35 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/staging/cx25821/cx25821-core.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 59fcd84e05e2..5e12fb4534ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 918e3592b9ea865ce29bda06a7200eba80d8d5f8
+refs/heads/master: c37c6d2196fc716abac6531c4cf08ad2874d52d8
diff --git a/trunk/drivers/staging/cx25821/cx25821-core.c b/trunk/drivers/staging/cx25821/cx25821-core.c
index c487c19256b9..ad7ce013ba50 100644
--- a/trunk/drivers/staging/cx25821/cx25821-core.c
+++ b/trunk/drivers/staging/cx25821/cx25821-core.c
@@ -962,7 +962,7 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 		       dev->pci->subsystem_device);
 
 		cx25821_devcount--;
-		return -ENODEV;
+		return -EBUSY;
 	}
 
 	/* PCIe stuff */
@@ -1412,9 +1412,12 @@ static int __devinit cx25821_initdev(struct pci_dev *pci_dev,
 
 	printk(KERN_INFO "cx25821 Athena pci enable !\n");
 
-	if (cx25821_dev_setup(dev) < 0) {
-		err = -EINVAL;
-		goto fail_unregister_device;
+	err = cx25821_dev_setup(dev);
+	if (err) {
+		if (err == -EBUSY)
+			goto fail_unregister_device;
+		else
+			goto fail_unregister_pci;
 	}
 
 	/* print pci info */
@@ -1448,6 +1451,8 @@ static int __devinit cx25821_initdev(struct pci_dev *pci_dev,
 	printk(KERN_INFO "cx25821 cx25821_initdev() can't get IRQ !\n");
 	cx25821_dev_unregister(dev);
 
+fail_unregister_pci:
+	pci_disable_device(pci_dev);
 fail_unregister_device:
 	v4l2_device_unregister(&dev->v4l2_dev);