diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/ide/ide-dma.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 06b14bc9a1d4..d4136908f916 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -449,7 +449,6 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) | |||
| 449 | ide_hwif_t *hwif = drive->hwif; | 449 | ide_hwif_t *hwif = drive->hwif; |
| 450 | const struct ide_dma_ops *dma_ops = hwif->dma_ops; | 450 | const struct ide_dma_ops *dma_ops = hwif->dma_ops; |
| 451 | struct ide_cmd *cmd = &hwif->cmd; | 451 | struct ide_cmd *cmd = &hwif->cmd; |
| 452 | struct request *rq; | ||
| 453 | ide_startstop_t ret = ide_stopped; | 452 | ide_startstop_t ret = ide_stopped; |
| 454 | 453 | ||
| 455 | /* | 454 | /* |
| @@ -487,14 +486,10 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) | |||
| 487 | ide_dma_off_quietly(drive); | 486 | ide_dma_off_quietly(drive); |
| 488 | 487 | ||
| 489 | /* | 488 | /* |
| 490 | * un-busy drive etc and make sure request is sane | 489 | * make sure request is sane |
| 491 | */ | 490 | */ |
| 492 | rq = hwif->rq; | 491 | if (hwif->rq) |
| 493 | if (rq) { | 492 | hwif->rq->errors = 0; |
| 494 | hwif->rq = NULL; | ||
| 495 | rq->errors = 0; | ||
| 496 | ide_requeue_and_plug(drive, rq); | ||
| 497 | } | ||
| 498 | return ret; | 493 | return ret; |
| 499 | } | 494 | } |
| 500 | 495 | ||