---

yaml --- r: 72025 b: refs/heads/master c: fcf94c8 h: refs/heads/master i: 72023: 018453a v: v3
git-mirror · Oct 22, 2007 · 9350f1b · 9350f1b
1 parent a823a8b
commit 9350f1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a13625c518ca6fd3ff7cb3b66d8023f843a745a3
+refs/heads/master: fcf94c89af8acccb14ce37b1c9e8dd6bd32a999d
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -793,7 +793,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 		       dev->pci->subsystem_device);
 
 		cx23885_devcount--;
-		goto fail_free;
+		return -ENODEV;
 	}
 
 	/* PCIe stuff */
@@ -835,10 +835,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	}
 
 	return 0;
-
-fail_free:
-	kfree(dev);
-	return -ENODEV;
 }
 
 void cx23885_dev_unregister(struct cx23885_dev *dev)