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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
s390
/
char
/
monreader.c
diff --git
a/drivers/s390/char/monreader.c
b/drivers/s390/char/monreader.c
index
5fd3ad8
..
fb7bc9e
100644
(file)
--- a/
drivers/s390/char/monreader.c
+++ b/
drivers/s390/char/monreader.c
@@
-257,14
+257,13
@@
mon_alloc_mem(void)
int i,j;
struct mon_private *monpriv;
int i,j;
struct mon_private *monpriv;
- monpriv = k
m
alloc(sizeof(struct mon_private), GFP_KERNEL);
+ monpriv = k
z
alloc(sizeof(struct mon_private), GFP_KERNEL);
if (!monpriv) {
P_ERROR("no memory for monpriv\n");
return NULL;
}
if (!monpriv) {
P_ERROR("no memory for monpriv\n");
return NULL;
}
- memset(monpriv, 0, sizeof(struct mon_private));
for (i = 0; i < MON_MSGLIM; i++) {
for (i = 0; i < MON_MSGLIM; i++) {
- monpriv->msg_array[i] = k
m
alloc(sizeof(struct mon_msg),
+ monpriv->msg_array[i] = k
z
alloc(sizeof(struct mon_msg),
GFP_KERNEL);
if (!monpriv->msg_array[i]) {
P_ERROR("open, no memory for msg_array\n");
GFP_KERNEL);
if (!monpriv->msg_array[i]) {
P_ERROR("open, no memory for msg_array\n");
@@
-272,7
+271,6
@@
mon_alloc_mem(void)
kfree(monpriv->msg_array[j]);
return NULL;
}
kfree(monpriv->msg_array[j]);
return NULL;
}
- memset(monpriv->msg_array[i], 0, sizeof(struct mon_msg));
}
return monpriv;
}
}
return monpriv;
}