git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
scsi
/
ncr53c8xx.c
diff --git
a/drivers/scsi/ncr53c8xx.c
b/drivers/scsi/ncr53c8xx.c
index
b28712d
..
22f9131
100644
(file)
--- a/
drivers/scsi/ncr53c8xx.c
+++ b/
drivers/scsi/ncr53c8xx.c
@@
-529,7
+529,7
@@
static void __unmap_scsi_data(struct device *dev, struct scsi_cmnd *cmd)
{
switch(cmd->__data_mapped) {
case 2:
{
switch(cmd->__data_mapped) {
case 2:
- dma_unmap_sg(dev, cmd->
request_
buffer, cmd->use_sg,
+ dma_unmap_sg(dev, cmd->buffer, cmd->use_sg,
cmd->sc_data_direction);
break;
case 1:
cmd->sc_data_direction);
break;
case 1:
@@
-564,7
+564,7
@@
static int __map_scsi_sg_data(struct device *dev, struct scsi_cmnd *cmd)
if (cmd->use_sg == 0)
return 0;
if (cmd->use_sg == 0)
return 0;
- use_sg = dma_map_sg(dev, cmd->
request_
buffer, cmd->use_sg,
+ use_sg = dma_map_sg(dev, cmd->buffer, cmd->use_sg,
cmd->sc_data_direction);
cmd->__data_mapped = 2;
cmd->__data_mapping = use_sg;
cmd->sc_data_direction);
cmd->__data_mapped = 2;
cmd->__data_mapping = use_sg;
@@
-5118,7
+5118,8
@@
static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp)
cp->host_status &= ~HS_SKIPMASK;
cp->start.schedule.l_paddr =
cpu_to_scr(NCB_SCRIPT_PHYS (np, select));
cp->host_status &= ~HS_SKIPMASK;
cp->start.schedule.l_paddr =
cpu_to_scr(NCB_SCRIPT_PHYS (np, select));
- list_move_tail(&cp->link_ccbq, &lp->skip_ccbq);
+ list_del(&cp->link_ccbq);
+ list_add_tail(&cp->link_ccbq, &lp->skip_ccbq);
if (cp->queued) {
--lp->queuedccbs;
}
if (cp->queued) {
--lp->queuedccbs;
}
@@
-7696,7
+7697,7
@@
static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
if (!use_sg)
segment = ncr_scatter_no_sglist(np, cp, cmd);
else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
if (!use_sg)
segment = ncr_scatter_no_sglist(np, cp, cmd);
else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
- struct scatterlist *scatter = (struct scatterlist *)cmd->
request_
buffer;
+ struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
struct scr_tblmove *data;
if (use_sg > MAX_SCATTER) {
struct scr_tblmove *data;
if (use_sg > MAX_SCATTER) {