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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pnp
/
pnpbios
/
proc.c
diff --git
a/drivers/pnp/pnpbios/proc.c
b/drivers/pnp/pnpbios/proc.c
index
5a3dfc9
..
8027073
100644
(file)
--- a/
drivers/pnp/pnpbios/proc.c
+++ b/
drivers/pnp/pnpbios/proc.c
@@
-87,7
+87,7
@@
static int proc_read_escd(char *buf, char **start, off_t pos,
return -EFBIG;
}
return -EFBIG;
}
- tmpbuf = k
calloc(1,
escd.escd_size, GFP_KERNEL);
+ tmpbuf = k
zalloc(
escd.escd_size, GFP_KERNEL);
if (!tmpbuf) return -ENOMEM;
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
if (!tmpbuf) return -ENOMEM;
if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
@@
-133,7
+133,7
@@
static int proc_read_devices(char *buf, char **start, off_t pos,
if (pos >= 0xff)
return 0;
if (pos >= 0xff)
return 0;
- node = k
calloc(1,
node_info.max_node_size, GFP_KERNEL);
+ node = k
zalloc(
node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM;
for (nodenum=pos; nodenum<0xff; ) {
if (!node) return -ENOMEM;
for (nodenum=pos; nodenum<0xff; ) {
@@
-168,7
+168,7
@@
static int proc_read_node(char *buf, char **start, off_t pos,
u8 nodenum = (long)data;
int len;
u8 nodenum = (long)data;
int len;
- node = k
calloc(1,
node_info.max_node_size, GFP_KERNEL);
+ node = k
zalloc(
node_info.max_node_size, GFP_KERNEL);
if (!node) return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
kfree(node);
if (!node) return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
kfree(node);
@@
-188,7
+188,7
@@
static int proc_write_node(struct file *file, const char __user *buf,
u8 nodenum = (long)data;
int ret = count;
u8 nodenum = (long)data;
int ret = count;
- node = k
calloc(1,
node_info.max_node_size, GFP_KERNEL);
+ node = k
zalloc(
node_info.max_node_size, GFP_KERNEL);
if (!node)
return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
if (!node)
return -ENOMEM;
if (pnp_bios_get_dev_node(&nodenum, boot, node)) {