diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/scsi/qla2xxx/qla_iocb.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_iocb.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index ebdc3c54d155..37f82e2cd7fb 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
| @@ -810,12 +810,8 @@ qla24xx_start_scsi(srb_t *sp) | |||
| 810 | ha->req_q_cnt = ha->request_q_length - | 810 | ha->req_q_cnt = ha->request_q_length - |
| 811 | (ha->req_ring_index - cnt); | 811 | (ha->req_ring_index - cnt); |
| 812 | } | 812 | } |
| 813 | if (ha->req_q_cnt < (req_cnt + 2)) { | 813 | if (ha->req_q_cnt < (req_cnt + 2)) |
| 814 | if (cmd->use_sg) | ||
| 815 | pci_unmap_sg(ha->pdev, sg, cmd->use_sg, | ||
| 816 | cmd->sc_data_direction); | ||
| 817 | goto queuing_error; | 814 | goto queuing_error; |
| 818 | } | ||
| 819 | 815 | ||
| 820 | /* Build command packet. */ | 816 | /* Build command packet. */ |
| 821 | ha->current_outstanding_cmd = handle; | 817 | ha->current_outstanding_cmd = handle; |