diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:48:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:48:34 -0400 |
commit | bced13738405b62c8203df9c103d4ba63d747872 (patch) | |
tree | 566795dc7493591182668a94855487dff034a2b3 /drivers/scsi/hosts.c | |
parent | 21f16289270447673a7263ccc0b22d562fb01ecb (diff) | |
parent | 2b053729a84b6aac197df51b8729bc9fec743bff (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (32 commits)
[SCSI] aacraid: prevent panic on adapter resource failure
[SCSI] aha152x: use data accessors and !use_sg cleanup
[SCSI] aha152x: Fix check_condition code-path
[SCSI] aha152x: Clean Reset path
[SCSI] aha152x: preliminary fixes and some comments
[SCSI] aha152x: use bounce buffer
[SCSI] aha152x: fix debug mode symbol conflict
[SCSI] sd: disentangle barriers in SCSI
[SCSI] lpfc : scsi command accessor fix for 8.2.2
[SCSI] qlogicpti: Some cosmetic changes
[SCSI] lpfc 8.2.2 : Change version number to 8.2.2
[SCSI] lpfc 8.2.2 : Style cleanups
[SCSI] lpfc 8.2.2 : Miscellaneous Bug Fixes
[SCSI] lpfc 8.2.2 : Miscellaneous management and logging mods
[SCSI] lpfc 8.2.2 : Rework the lpfc_printf_log() macro
[SCSI] lpfc 8.2.2 : Attribute and Parameter splits for vport and physical port
[SCSI] lpfc 8.2.2 : Fix locking around HBA's port_list
[SCSI] lpfc 8.2.2 : Error messages and debugfs updates
[SCSI] initialize shost_data to zero
[SCSI] mptsas: add SMP passthrough support via bsg
...
Diffstat (limited to 'drivers/scsi/hosts.c')
-rw-r--r-- | drivers/scsi/hosts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index bd8e7f323c69..96bc31266c98 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -220,7 +220,7 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev) | |||
220 | get_device(&shost->shost_gendev); | 220 | get_device(&shost->shost_gendev); |
221 | 221 | ||
222 | if (shost->transportt->host_size && | 222 | if (shost->transportt->host_size && |
223 | (shost->shost_data = kmalloc(shost->transportt->host_size, | 223 | (shost->shost_data = kzalloc(shost->transportt->host_size, |
224 | GFP_KERNEL)) == NULL) | 224 | GFP_KERNEL)) == NULL) |
225 | goto out_del_classdev; | 225 | goto out_del_classdev; |
226 | 226 | ||