diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-23 11:13:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-23 11:13:19 -0700 |
| commit | 66c7d2f1d9cb19e46717b26fb49550b5e82985fe (patch) | |
| tree | dd9624a28fe20cefa2fd4390abd0e0fa611f3a7e /drivers/sbus | |
| parent | 36e82dfda526e2dea26060e8766bda5a8110c4e6 (diff) | |
| parent | c3b99f0db9b2ef4292ef774bae1ea0d6f1e8d82a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNHME]: Fix module unload.
[SUNLANCE]: Fix module unload.
[SUNQE]: Fix MAC address assignment.
[SBUS] vfc_dev.c: kzalloc
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/vfc_dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 8bfb67ccdcd..c3135e2fbd5 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c @@ -259,11 +259,10 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, void __user *argp) if (copy_from_user(&inout, argp, sizeof(inout))) return -EFAULT; - buffer = kmalloc(inout.len, GFP_KERNEL); + buffer = kzalloc(inout.len, GFP_KERNEL); if (buffer == NULL) return -ENOMEM; - memset(buffer,0,inout.len); vfc_lock_device(dev); inout.ret= vfc_i2c_recvbuf(dev,inout.addr & 0xff |