diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/mxb.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/mxb.c')
| -rw-r--r-- | drivers/media/video/mxb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 91681aa6c657..8416ceff524b 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
| @@ -177,12 +177,11 @@ static int mxb_probe(struct saa7146_dev* dev) | |||
| 177 | return -ENODEV; | 177 | return -ENODEV; |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | mxb = (struct mxb*)kmalloc(sizeof(struct mxb), GFP_KERNEL); | 180 | mxb = kzalloc(sizeof(struct mxb), GFP_KERNEL); |
| 181 | if( NULL == mxb ) { | 181 | if( NULL == mxb ) { |
| 182 | DEB_D(("not enough kernel memory.\n")); | 182 | DEB_D(("not enough kernel memory.\n")); |
| 183 | return -ENOMEM; | 183 | return -ENOMEM; |
| 184 | } | 184 | } |
| 185 | memset(mxb, 0x0, sizeof(struct mxb)); | ||
| 186 | 185 | ||
| 187 | mxb->i2c_adapter = (struct i2c_adapter) { | 186 | mxb->i2c_adapter = (struct i2c_adapter) { |
| 188 | .class = I2C_CLASS_TV_ANALOG, | 187 | .class = I2C_CLASS_TV_ANALOG, |