diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 21:57:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 21:57:35 -0400 |
| commit | 97d41e90fe61399b99d74820cb7f2d6e0fbac91d (patch) | |
| tree | f759371424a26963b04badbb4433e360be4e8750 /drivers/scsi/qla1280.c | |
| parent | 3bdc9d0b408e01c4e556daba0035ba37f603e920 (diff) | |
| parent | afaf5a2d341d33b66b47c2716a263ce593460a08 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
[SCSI] Initial Commit of qla4xxx
[SCSI] raid class: handle component-add errors
[SCSI] SCSI megaraid_sas: handle thrown errors
[SCSI] SCSI aic94xx: handle sysfs errors
[SCSI] SCSI st: fix error handling in module init, sysfs
[SCSI] SCSI sd: fix module init/exit error handling
[SCSI] SCSI osst: add error handling to module init, sysfs
[SCSI] scsi: remove hosts.h
[SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
[SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
[SCSI] megaraid_sas: adds tasklet for cmd completion
[SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
[SCSI] megaraid_sas: function pointer for disable interrupt
[SCSI] megaraid_sas: frame count optimization
[SCSI] megaraid_sas: FW transition and q size changes
[SCSI] qla2xxx: Update version number to 8.01.07-k2.
[SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
[SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
[SCSI] qla2xxx: Add support for host port state FC transport attribute.
[SCSI] qla2xxx: Add support for fabric name FC transport attribute.
...
Diffstat (limited to 'drivers/scsi/qla1280.c')
| -rw-r--r-- | drivers/scsi/qla1280.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 332151e2a018..9f33e5946c0d 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -2862,7 +2862,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp) | |||
| 2862 | memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8)); | 2862 | memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8)); |
| 2863 | 2863 | ||
| 2864 | /* Set ISP command timeout. */ | 2864 | /* Set ISP command timeout. */ |
| 2865 | pkt->timeout = cpu_to_le16(30); | 2865 | pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ); |
| 2866 | 2866 | ||
| 2867 | /* Set device target ID and LUN */ | 2867 | /* Set device target ID and LUN */ |
| 2868 | pkt->lun = SCSI_LUN_32(cmd); | 2868 | pkt->lun = SCSI_LUN_32(cmd); |
| @@ -3161,7 +3161,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp) | |||
| 3161 | memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8)); | 3161 | memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8)); |
| 3162 | 3162 | ||
| 3163 | /* Set ISP command timeout. */ | 3163 | /* Set ISP command timeout. */ |
| 3164 | pkt->timeout = cpu_to_le16(30); | 3164 | pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ); |
| 3165 | 3165 | ||
| 3166 | /* Set device target ID and LUN */ | 3166 | /* Set device target ID and LUN */ |
| 3167 | pkt->lun = SCSI_LUN_32(cmd); | 3167 | pkt->lun = SCSI_LUN_32(cmd); |
| @@ -4484,7 +4484,7 @@ qla1280_init(void) | |||
| 4484 | qla1280_setup(qla1280); | 4484 | qla1280_setup(qla1280); |
| 4485 | #endif | 4485 | #endif |
| 4486 | 4486 | ||
| 4487 | return pci_module_init(&qla1280_pci_driver); | 4487 | return pci_register_driver(&qla1280_pci_driver); |
| 4488 | } | 4488 | } |
| 4489 | 4489 | ||
| 4490 | static void __exit | 4490 | static void __exit |