From 8e8335d5d7148fba09b1ce3e2f6e3d5e56411c94 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 14 Apr 2009 19:50:33 -0300
Subject: [PATCH] --- yaml --- r: 144341 b: refs/heads/master c:
 5b83cfa98569663b6fa6cda85a1f2fd371a082c7 h: refs/heads/master i:   144339:
 2267ea1426c7b577c003bae8e1c2ad9dde7691d2 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/video/saa5249.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1df918fe01f8..beeafbce3c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3964b58a25fdca066011600bf58b38d00e9ae28d
+refs/heads/master: 5b83cfa98569663b6fa6cda85a1f2fd371a082c7
diff --git a/trunk/drivers/media/video/saa5249.c b/trunk/drivers/media/video/saa5249.c
index 48b27fe48087..271d6e931b75 100644
--- a/trunk/drivers/media/video/saa5249.c
+++ b/trunk/drivers/media/video/saa5249.c
@@ -598,6 +598,7 @@ static int saa5249_probe(struct i2c_client *client,
 	/* Now create a video4linux device */
 	t->vdev = video_device_alloc();
 	if (t->vdev == NULL) {
+		kfree(t);
 		kfree(client);
 		return -ENOMEM;
 	}
@@ -617,9 +618,8 @@ static int saa5249_probe(struct i2c_client *client,
 	/* Register it */
 	err = video_register_device(t->vdev, VFL_TYPE_VTX, -1);
 	if (err < 0) {
-		kfree(t);
 		video_device_release(t->vdev);
-		t->vdev = NULL;
+		kfree(t);
 		return err;
 	}
 	return 0;