projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IA64] Manual merge fix for 3 files
[powerpc.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_iocb.c
diff --git
a/drivers/scsi/qla2xxx/qla_iocb.c
b/drivers/scsi/qla2xxx/qla_iocb.c
index
5f34504
..
37f82e2
100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_iocb.c
+++ b/
drivers/scsi/qla2xxx/qla_iocb.c
@@
-748,7
+748,7
@@
qla24xx_start_scsi(srb_t *sp)
uint16_t cnt;
uint16_t req_cnt;
uint16_t tot_dsds;
uint16_t cnt;
uint16_t req_cnt;
uint16_t tot_dsds;
- struct device_reg_24xx __iomem *reg
= &ha->iobase->isp24
;
+ struct device_reg_24xx __iomem *reg;
char tag[2];
/* Setup device pointers. */
char tag[2];
/* Setup device pointers. */
@@
-810,12
+810,8
@@
qla24xx_start_scsi(srb_t *sp)
ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt);
}
ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt);
}
- if (ha->req_q_cnt < (req_cnt + 2)) {
- if (cmd->use_sg)
- pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
- cmd->sc_data_direction);
+ if (ha->req_q_cnt < (req_cnt + 2))
goto queuing_error;
goto queuing_error;
- }
/* Build command packet. */
ha->current_outstanding_cmd = handle;
/* Build command packet. */
ha->current_outstanding_cmd = handle;