aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index d8caa65ca7a5..4b32c4eb7b82 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -99,11 +99,6 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
99 memset(&cmd, 0, sizeof(cmd)); 99 memset(&cmd, 0, sizeof(cmd));
100 cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; 100 cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
101 101
102 if (dma == 0) {
103 ide_init_sg_cmd(&cmd, nsectors);
104 ide_map_sg(drive, rq);
105 }
106
107 if (drive->dev_flags & IDE_DFLAG_LBA) { 102 if (drive->dev_flags & IDE_DFLAG_LBA) {
108 if (lba48) { 103 if (lba48) {
109 pr_debug("%s: LBA=0x%012llx\n", drive->name, 104 pr_debug("%s: LBA=0x%012llx\n", drive->name,
@@ -156,6 +151,11 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
156 ide_tf_set_cmd(drive, &cmd, dma); 151 ide_tf_set_cmd(drive, &cmd, dma);
157 cmd.rq = rq; 152 cmd.rq = rq;
158 153
154 if (dma == 0) {
155 ide_init_sg_cmd(&cmd, nsectors);
156 ide_map_sg(drive, &cmd);
157 }
158
159 rc = do_rw_taskfile(drive, &cmd); 159 rc = do_rw_taskfile(drive, &cmd);
160 160
161 if (rc == ide_stopped && dma) { 161 if (rc == ide_stopped && dma) {