projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
scsi
/
hosts.c
diff --git
a/drivers/scsi/hosts.c
b/drivers/scsi/hosts.c
index
5881079
..
ef57f25
100644
(file)
--- a/
drivers/scsi/hosts.c
+++ b/
drivers/scsi/hosts.c
@@
-306,10
+306,9
@@
struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
dump_stack();
}
dump_stack();
}
- shost = k
m
alloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);
+ shost = k
z
alloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);
if (!shost)
return NULL;
if (!shost)
return NULL;
- memset(shost, 0, sizeof(struct Scsi_Host) + privsize);
spin_lock_init(&shost->default_lock);
scsi_assign_lock(shost, &shost->default_lock);
spin_lock_init(&shost->default_lock);
scsi_assign_lock(shost, &shost->default_lock);