---

yaml --- r: 130773 b: refs/heads/master c: 2c1a3c9 h: refs/heads/master i: 130771: b670ff7 v: v3
git-mirror · Jan 29, 2009 · 9a6d0ca · 9a6d0ca
1 parent fe71a74
commit 9a6d0ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd9c2eac31d8b3c1b719c7dfbbfed17c5cbccc4
+refs/heads/master: 2c1a3c979ce66e3073c1b87373c0c01a95f847e6
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c
@@ -949,8 +949,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 	itv->instance = atomic_inc_return(&ivtv_instance) - 1;
 
 	retval = v4l2_device_register(&dev->dev, &itv->device);
-	if (retval)
+	if (retval) {
+		kfree(itv);
 		return retval;
+	}
 	/* "ivtv + PCI ID" is a bit of a mouthful, so use
 	   "ivtv + instance" instead. */
 	snprintf(itv->device.name, sizeof(itv->device.name),