summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 14:46:34 +0300
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 14:46:34 +0300
commitc152cc1a90f9680cefa74d9ff9ce36038081ba72 (patch)
tree7932faaf671d8ac20d61a2df2cfe43c7919b0d4f /drivers/ide/ide-io.c
parent5e2040fd0a97888952b37243b5868872bbe0f6ac (diff)
downloadlinux-c152cc1a90f9680cefa74d9ff9ce36038081ba72.tar.xz
ide: use ->end_request only for private device driver requests
* Move IDE{FLOPPY,TAPE}_ERROR_* defines to <linux/ide.h> and rename them to IDE_DRV_ERROR_*. * Handle ->end_request special cases for floppy/tape media in ide_kill_rq(). * Call ->end_request only for private device driver requests. There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 38076169b893..da2f97dfa8f8 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -178,7 +178,12 @@ EXPORT_SYMBOL(ide_complete_rq);
void ide_kill_rq(ide_drive_t *drive, struct request *rq)
{
- if (rq->rq_disk) {
+ drive->failed_pc = NULL;
+
+ if (drive->media == ide_tape)
+ rq->errors = IDE_DRV_ERROR_GENERAL;
+
+ if (blk_special_request(rq) && rq->rq_disk) {
struct ide_driver *drv;
drv = *(struct ide_driver **)rq->rq_disk->private_data;