diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-09-03 16:12:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:18 -0400 |
commit | c5bf204f42423f49d7ea34f14eef92780204e168 (patch) | |
tree | b6a835a5e72052fa22963f7b30fa0f1baf559bad /drivers | |
parent | dc60de338f4b2d445a24d4e36bbc994f3badb406 (diff) |
V4L/DVB (8790): saa7115: call i2c_set_clientdata only when state != NULL
Not a bug as such, but it looks really strange doing this before
checking whether the state structure could be allocated.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-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, | |||
1489 | client->addr << 1, client->adapter->name); | 1489 | client->addr << 1, client->adapter->name); |
1490 | 1490 | ||
1491 | state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL); | 1491 | state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL); |
1492 | i2c_set_clientdata(client, state); | 1492 | if (state == NULL) |
1493 | if (state == NULL) { | ||
1494 | return -ENOMEM; | 1493 | return -ENOMEM; |
1495 | } | 1494 | i2c_set_clientdata(client, state); |
1496 | state->input = -1; | 1495 | state->input = -1; |
1497 | state->output = SAA7115_IPORT_ON; | 1496 | state->output = SAA7115_IPORT_ON; |
1498 | state->enable = 1; | 1497 | state->enable = 1; |