git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
s390
/
cio
/
device.c
diff --git
a/drivers/s390/cio/device.c
b/drivers/s390/cio/device.c
index
8e3053c
..
afc4e88
100644
(file)
--- a/
drivers/s390/cio/device.c
+++ b/
drivers/s390/cio/device.c
@@
-826,15
+826,17
@@
io_subchannel_probe (struct subchannel *sch)
get_device(&cdev->dev);
return 0;
}
get_device(&cdev->dev);
return 0;
}
- cdev
= kz
alloc (sizeof(*cdev), GFP_KERNEL);
+ cdev
= km
alloc (sizeof(*cdev), GFP_KERNEL);
if (!cdev)
return -ENOMEM;
if (!cdev)
return -ENOMEM;
- cdev->private = kzalloc(sizeof(struct ccw_device_private),
+ memset(cdev, 0, sizeof(struct ccw_device));
+ cdev->private = kmalloc(sizeof(struct ccw_device_private),
GFP_KERNEL | GFP_DMA);
if (!cdev->private) {
kfree(cdev);
return -ENOMEM;
}
GFP_KERNEL | GFP_DMA);
if (!cdev->private) {
kfree(cdev);
return -ENOMEM;
}
+ memset(cdev->private, 0, sizeof(struct ccw_device_private));
atomic_set(&cdev->private->onoff, 0);
cdev->dev = (struct device) {
.parent = &sch->dev,
atomic_set(&cdev->private->onoff, 0);
cdev->dev = (struct device) {
.parent = &sch->dev,