diff options
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 |