From 35f9c3597cb919cbf00ea0002b3981ea703e7063 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 3 Sep 2008 17:12:09 -0300
Subject: [PATCH] --- yaml --- r: 109555 b: refs/heads/master c:
 c5bf204f42423f49d7ea34f14eef92780204e168 h: refs/heads/master i:   109553:
 0c8beec5f4eced7a53b3f7450658048777d2a440   109551:
 d0cbb6d54244187237b607ca7c038cc517d09988 v: v3

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

diff --git a/[refs] b/[refs]
index 55cd9a720aab..4727a082a304 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc60de338f4b2d445a24d4e36bbc994f3badb406
+refs/heads/master: c5bf204f42423f49d7ea34f14eef92780204e168
diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c
index bcd1c8f6cf6b..ad733caec720 100644
--- a/trunk/drivers/media/video/saa7115.c
+++ b/trunk/drivers/media/video/saa7115.c
@@ -1489,10 +1489,9 @@ static int saa7115_probe(struct i2c_client *client,
 		 client->addr << 1, client->adapter->name);
 
 	state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL);
-	i2c_set_clientdata(client, state);
-	if (state == NULL) {
+	if (state == NULL)
 		return -ENOMEM;
-	}
+	i2c_set_clientdata(client, state);
 	state->input = -1;
 	state->output = SAA7115_IPORT_ON;
 	state->enable = 1;