aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2008-07-23 13:56:00 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:56:00 -0400
commit08feacf3bcc20c33e6a2a91d85d8190dd219d967 (patch)
treeadf40b044b554ee33da8b4de9562c87c69bd6e9e
parent0014c75be31d9fa7435105afa9960374a82cc55c (diff)
ide-scsi: pass packet command in rq->cmd
Make a redundant copy of the packet command bits into rq->cmd. Later, after all drivers have been converted, it'll be switched to use that in the common code instead of pc->c. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/scsi/ide-scsi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 37cfec43bd40..1ec439320018 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -237,6 +237,7 @@ static int idescsi_check_condition(ide_drive_t *drive,
237 ide_scsi_hex_dump(pc->c, 6); 237 ide_scsi_hex_dump(pc->c, 6);
238 } 238 }
239 rq->rq_disk = scsi->disk; 239 rq->rq_disk = scsi->disk;
240 memcpy(rq->cmd, pc->c, 12);
240 ide_do_drive_cmd(drive, rq); 241 ide_do_drive_cmd(drive, rq);
241 return 0; 242 return 0;
242} 243}
@@ -632,6 +633,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
632 rq->special = (char *) pc; 633 rq->special = (char *) pc;
633 rq->cmd_type = REQ_TYPE_SPECIAL; 634 rq->cmd_type = REQ_TYPE_SPECIAL;
634 spin_unlock_irq(host->host_lock); 635 spin_unlock_irq(host->host_lock);
636 memcpy(rq->cmd, pc->c, 12);
635 blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL); 637 blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL);
636 spin_lock_irq(host->host_lock); 638 spin_lock_irq(host->host_lock);
637 return 0; 639 return 0;