---

yaml --- r: 109555 b: refs/heads/master c: c5bf204 h: refs/heads/master i: 109553: 0c8beec 109551: d0cbb6d v: v3
git-mirror · Sep 3, 2008 · 35f9c35 · 35f9c35
1 parent ab1a281
commit 35f9c35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;