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/ovcamchip/ov7x20.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/ovcamchip/ov7x20.c')
-rw-r--r-- | drivers/media/video/ovcamchip/ov7x20.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/ovcamchip/ov7x20.c b/drivers/media/video/ovcamchip/ov7x20.c index 3c8c48f338b..8e26ae338f3 100644 --- a/drivers/media/video/ovcamchip/ov7x20.c +++ b/drivers/media/video/ovcamchip/ov7x20.c @@ -232,10 +232,9 @@ static int ov7x20_init(struct i2c_client *c) if (rc < 0) return rc; - ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL); + ov->spriv = s = kzalloc(sizeof *s, GFP_KERNEL); if (!s) return -ENOMEM; - memset(s, 0, sizeof *s); s->auto_brt = 1; s->auto_exp = DFL_AUTO_EXP; |