projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: convert to iomap
[powerpc.git]
/
drivers
/
scsi
/
BusLogic.c
diff --git
a/drivers/scsi/BusLogic.c
b/drivers/scsi/BusLogic.c
index
cdd0337
..
3075204
100644
(file)
--- a/
drivers/scsi/BusLogic.c
+++ b/
drivers/scsi/BusLogic.c
@@
-2186,21
+2186,21
@@
static int __init BusLogic_init(void)
if (BusLogic_ProbeOptions.NoProbe)
return -ENODEV;
if (BusLogic_ProbeOptions.NoProbe)
return -ENODEV;
- BusLogic_ProbeInfoList =
(struct BusLogic_ProbeInfo *)
- k
malloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_ATOMIC
);
+ BusLogic_ProbeInfoList =
+ k
zalloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_KERNEL
);
if (BusLogic_ProbeInfoList == NULL) {
BusLogic_Error("BusLogic: Unable to allocate Probe Info List\n", NULL);
return -ENOMEM;
}
if (BusLogic_ProbeInfoList == NULL) {
BusLogic_Error("BusLogic: Unable to allocate Probe Info List\n", NULL);
return -ENOMEM;
}
- memset(BusLogic_ProbeInfoList, 0, BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo));
- PrototypeHostAdapter =
(struct BusLogic_HostAdapter *)
- k
malloc(sizeof(struct BusLogic_HostAdapter), GFP_ATOMIC
);
+
+ PrototypeHostAdapter =
+ k
zalloc(sizeof(struct BusLogic_HostAdapter), GFP_KERNEL
);
if (PrototypeHostAdapter == NULL) {
kfree(BusLogic_ProbeInfoList);
BusLogic_Error("BusLogic: Unable to allocate Prototype " "Host Adapter\n", NULL);
return -ENOMEM;
}
if (PrototypeHostAdapter == NULL) {
kfree(BusLogic_ProbeInfoList);
BusLogic_Error("BusLogic: Unable to allocate Prototype " "Host Adapter\n", NULL);
return -ENOMEM;
}
- memset(PrototypeHostAdapter, 0, sizeof(struct BusLogic_HostAdapter));
+
#ifdef MODULE
if (BusLogic != NULL)
BusLogic_Setup(BusLogic);
#ifdef MODULE
if (BusLogic != NULL)
BusLogic_Setup(BusLogic);