diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:22:04 -0700 |
| commit | 1c08232cfe5e68c6234305a3abb64d52d89c9ead (patch) | |
| tree | ffba8b76685d26e719c20591e7b2b04468dd8507 /drivers/media/video/m52790.c | |
| parent | 8db72a7d7268630e04ec285fbd3e90733b2eddf9 (diff) | |
| parent | b730011061e2805a46b7291e708b6caaf2be6869 (diff) | |
| download | op-kernel-dev-1c08232cfe5e68c6234305a3abb64d52d89c9ead.zip op-kernel-dev-1c08232cfe5e68c6234305a3abb64d52d89c9ead.tar.gz | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] ngene: Fix CI data transfer regression Fix CI data transfer regression introduced by previous cleanup.
[media] v4l: make sure drivers supply a zeroed struct v4l2_subdev
[media] Missing frontend config for LME DM04/QQBOX
[media] rc_core: avoid kernel oops when rmmod saa7134
[media] imon: add conditional locking in change_protocol
[media] rc: show RC_TYPE_OTHER in sysfs
[media] ite-cir: modular build on ppc requires delay.h include
[media] mceusb: add Dell transceiver ID
Diffstat (limited to 'drivers/media/video/m52790.c')
| -rw-r--r-- | drivers/media/video/m52790.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c index 5e1c9a8..303ffa7 100644 --- a/drivers/media/video/m52790.c +++ b/drivers/media/video/m52790.c @@ -174,7 +174,7 @@ static int m52790_probe(struct i2c_client *client, v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name); - state = kmalloc(sizeof(struct m52790_state), GFP_KERNEL); + state = kzalloc(sizeof(struct m52790_state), GFP_KERNEL); if (state == NULL) return -ENOMEM; |
