diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 669ea1e45795..6360bbd37efe 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -307,7 +307,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) | |||
307 | { | 307 | { |
308 | ide_startstop_t startstop; | 308 | ide_startstop_t startstop; |
309 | 309 | ||
310 | BUG_ON(!(rq->cmd_flags & REQ_STARTED)); | 310 | BUG_ON(!(rq->rq_flags & RQF_STARTED)); |
311 | 311 | ||
312 | #ifdef DEBUG | 312 | #ifdef DEBUG |
313 | printk("%s: start_request: current=0x%08lx\n", | 313 | printk("%s: start_request: current=0x%08lx\n", |
@@ -316,7 +316,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) | |||
316 | 316 | ||
317 | /* bail early if we've exceeded max_failures */ | 317 | /* bail early if we've exceeded max_failures */ |
318 | if (drive->max_failures && (drive->failures > drive->max_failures)) { | 318 | if (drive->max_failures && (drive->failures > drive->max_failures)) { |
319 | rq->cmd_flags |= REQ_FAILED; | 319 | rq->rq_flags |= RQF_FAILED; |
320 | goto kill_rq; | 320 | goto kill_rq; |
321 | } | 321 | } |
322 | 322 | ||
@@ -539,7 +539,7 @@ repeat: | |||
539 | */ | 539 | */ |
540 | if ((drive->dev_flags & IDE_DFLAG_BLOCKED) && | 540 | if ((drive->dev_flags & IDE_DFLAG_BLOCKED) && |
541 | ata_pm_request(rq) == 0 && | 541 | ata_pm_request(rq) == 0 && |
542 | (rq->cmd_flags & REQ_PREEMPT) == 0) { | 542 | (rq->rq_flags & RQF_PREEMPT) == 0) { |
543 | /* there should be no pending command at this point */ | 543 | /* there should be no pending command at this point */ |
544 | ide_unlock_port(hwif); | 544 | ide_unlock_port(hwif); |
545 | goto plug_device; | 545 | goto plug_device; |