diff options
-rw-r--r-- | drivers/ide/ide-tape.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 8f10211c2b08..48fccf154f68 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -696,7 +696,7 @@ static void idetape_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc, | |||
696 | * last packet command. We queue a request sense packet command in | 696 | * last packet command. We queue a request sense packet command in |
697 | * the head of the request list. | 697 | * the head of the request list. |
698 | */ | 698 | */ |
699 | static ide_startstop_t idetape_retry_pc (ide_drive_t *drive) | 699 | static void idetape_retry_pc(ide_drive_t *drive) |
700 | { | 700 | { |
701 | idetape_tape_t *tape = drive->driver_data; | 701 | idetape_tape_t *tape = drive->driver_data; |
702 | struct ide_atapi_pc *pc; | 702 | struct ide_atapi_pc *pc; |
@@ -708,7 +708,6 @@ static ide_startstop_t idetape_retry_pc (ide_drive_t *drive) | |||
708 | idetape_create_request_sense_cmd(pc); | 708 | idetape_create_request_sense_cmd(pc); |
709 | set_bit(IDETAPE_FLAG_IGNORE_DSC, &tape->flags); | 709 | set_bit(IDETAPE_FLAG_IGNORE_DSC, &tape->flags); |
710 | idetape_queue_pc_head(drive, pc, rq); | 710 | idetape_queue_pc_head(drive, pc, rq); |
711 | return ide_stopped; | ||
712 | } | 711 | } |
713 | 712 | ||
714 | /* | 713 | /* |
@@ -784,7 +783,8 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive) | |||
784 | pc->c[0]); | 783 | pc->c[0]); |
785 | 784 | ||
786 | /* Retry operation */ | 785 | /* Retry operation */ |
787 | return idetape_retry_pc(drive); | 786 | idetape_retry_pc(drive); |
787 | return ide_stopped; | ||
788 | } | 788 | } |
789 | pc->error = 0; | 789 | pc->error = 0; |
790 | if ((pc->flags & PC_FLAG_WAIT_FOR_DSC) && | 790 | if ((pc->flags & PC_FLAG_WAIT_FOR_DSC) && |
@@ -1078,7 +1078,8 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) | |||
1078 | printk(KERN_ERR "ide-tape: %s: I/O error, ", | 1078 | printk(KERN_ERR "ide-tape: %s: I/O error, ", |
1079 | tape->name); | 1079 | tape->name); |
1080 | /* Retry operation */ | 1080 | /* Retry operation */ |
1081 | return idetape_retry_pc(drive); | 1081 | idetape_retry_pc(drive); |
1082 | return ide_stopped; | ||
1082 | } | 1083 | } |
1083 | pc->error = 0; | 1084 | pc->error = 0; |
1084 | if (tape->failed_pc == pc) | 1085 | if (tape->failed_pc == pc) |