projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ide
/
ide-floppy.c
diff --git
a/drivers/ide/ide-floppy.c
b/drivers/ide/ide-floppy.c
index 8c6363cdd2084a55ae4cfc9141e08cccde03c223..2fb5350c54105000d57bf1672b101e3e40fdd9ca 100644
(file)
--- a/
drivers/ide/ide-floppy.c
+++ b/
drivers/ide/ide-floppy.c
@@
-97,7
+97,7
@@
static int ide_floppy_callback(ide_drive_t *drive, int dsc)
"Aborting request!\n");
}
"Aborting request!\n");
}
- if (rq->cmd_type == REQ_TYPE_
SPECIAL
)
+ if (rq->cmd_type == REQ_TYPE_
DRV_PRIV
)
rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
return uptodate;
rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
return uptodate;
@@
-246,7
+246,7
@@
static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
} else
printk(KERN_ERR PFX "%s: I/O error\n", drive->name);
} else
printk(KERN_ERR PFX "%s: I/O error\n", drive->name);
- if (rq->cmd_type == REQ_TYPE_
SPECIAL
) {
+ if (rq->cmd_type == REQ_TYPE_
DRV_PRIV
) {
rq->errors = 0;
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
rq->errors = 0;
ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
@@
-265,8
+265,8
@@
static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
pc = &floppy->queued_pc;
idefloppy_create_rw_cmd(drive, pc, rq, (unsigned long)block);
break;
pc = &floppy->queued_pc;
idefloppy_create_rw_cmd(drive, pc, rq, (unsigned long)block);
break;
- case REQ_TYPE_
SPECIAL
:
- case REQ_TYPE_SENSE:
+ case REQ_TYPE_
DRV_PRIV
:
+ case REQ_TYPE_
ATA_
SENSE:
pc = (struct ide_atapi_pc *)rq->special;
break;
case REQ_TYPE_BLOCK_PC:
pc = (struct ide_atapi_pc *)rq->special;
break;
case REQ_TYPE_BLOCK_PC: