diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/tvp5150.c | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/tvp5150.c')
| -rw-r--r-- | drivers/media/video/tvp5150.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index c35b8042eee..e86b522938f 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c @@ -1074,12 +1074,11 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, return -ENOMEM; memcpy(c, &client_template, sizeof(struct i2c_client)); - core = kmalloc(sizeof(struct tvp5150), GFP_KERNEL); + core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL); if (core == 0) { kfree(c); return -ENOMEM; } - memset(core, 0, sizeof(struct tvp5150)); i2c_set_clientdata(c, core); rv = i2c_attach_client(c); |