git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some kmalloc/memset ->kzalloc (tree wide)
[safe/jmp/linux-2.6]
/
drivers
/
w1
/
masters
/
matrox_w1.c
diff --git
a/drivers/w1/masters/matrox_w1.c
b/drivers/w1/masters/matrox_w1.c
index
6f9d880
..
d356da5
100644
(file)
--- a/
drivers/w1/masters/matrox_w1.c
+++ b/
drivers/w1/masters/matrox_w1.c
@@
-164,7
+164,7
@@
static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
return -ENODEV;
if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
return -ENODEV;
- dev = k
m
alloc(sizeof(struct matrox_device) +
+ dev = k
z
alloc(sizeof(struct matrox_device) +
sizeof(struct w1_bus_master), GFP_KERNEL);
if (!dev) {
dev_err(&pdev->dev,
sizeof(struct w1_bus_master), GFP_KERNEL);
if (!dev) {
dev_err(&pdev->dev,
@@
-173,7
+173,6
@@
static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
return -ENOMEM;
}
return -ENOMEM;
}
- memset(dev, 0, sizeof(struct matrox_device) + sizeof(struct w1_bus_master));
dev->bus_master = (struct w1_bus_master *)(dev + 1);
dev->bus_master = (struct w1_bus_master *)(dev + 1);