diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:13:58 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:13:58 +0400 |
commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/video/saa7115.c | |
parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | linux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.xz |
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r-- | drivers/media/video/saa7115.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index bcd1c8f6cf6b..ad733caec720 100644 --- a/drivers/media/video/saa7115.c +++ b/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; |