summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-24 11:29:30 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-11 04:18:32 +0200
commit6c832e36447821779344f3d33970a4a7a10245cc (patch)
treeaaa6aad7f9ad1f85415cd1c52db7b905ac4e802f
parentV4L/DVB (8559a): Fix a merge conflict at gspca/sonixb (diff)
downloadlinux-6c832e36447821779344f3d33970a4a7a10245cc.tar.xz
linux-6c832e36447821779344f3d33970a4a7a10245cc.zip
V4L/DVB (8789): wm8739: remove wrong kfree
i2c_client is allocated for us, we should never free it ourselves. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/wm8739.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index 95c79ad80487..54ac3fe26ec2 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -274,10 +274,8 @@ static int wm8739_probe(struct i2c_client *client,
client->addr << 1, client->adapter->name);
state = kmalloc(sizeof(struct wm8739_state), GFP_KERNEL);
- if (state == NULL) {
- kfree(client);
+ if (state == NULL)
return -ENOMEM;
- }
state->vol_l = 0x17; /* 0dB */
state->vol_r = 0x17; /* 0dB */
state->muted = 0;