diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 17:53:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 17:53:54 -0400 |
| commit | 42fdd144a40f3afaccaa7ea538268bad3596439e (patch) | |
| tree | 9986c7f04682408fe1ad983297b0576f68387a68 /Documentation | |
| parent | 4314652bb41df08ad65bd25176ba1dfd24b14a51 (diff) | |
| parent | 64a8f00ff19508b3962c8a932375dbae88bee4d6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (76 commits)
IDE: Report errors during drive reset back to user space
Update documentation of HDIO_DRIVE_RESET ioctl
IDE: Remove unused code
IDE: Fix HDIO_DRIVE_RESET handling
hd.c: remove the #include <linux/mc146818rtc.h>
update the BLK_DEV_HD help text
move ide/legacy/hd.c to drivers/block/
ide/legacy/hd.c: use late_initcall()
remove BLK_DEV_HD_ONLY
ide: endian annotations in ide-floppy.c
ide-floppy: zero out the whole struct ide_atapi_pc on init
ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open
ide-cd: move request prep chunk from cdrom_do_newpc_cont to rq issue path
ide-cd: move request prep from cdrom_start_rw_cont to rq issue path
ide-cd: move request prep from cdrom_start_seek_continuation to rq issue path
ide-cd: fold cdrom_start_seek into ide_cd_do_request
ide-cd: simplify request issuing path
ide-cd: mv ide_do_rw_cdrom ide_cd_do_request
ide-cd: cdrom_start_seek: remove unused argument block
ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ioctl/hdio.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index c19efdeace2..91a6ecbae0b 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt | |||
| @@ -508,12 +508,13 @@ HDIO_DRIVE_RESET execute a device reset | |||
| 508 | 508 | ||
| 509 | error returns: | 509 | error returns: |
| 510 | EACCES Access denied: requires CAP_SYS_ADMIN | 510 | EACCES Access denied: requires CAP_SYS_ADMIN |
| 511 | ENXIO No such device: phy dead or ctl_addr == 0 | ||
| 512 | EIO I/O error: reset timed out or hardware error | ||
| 511 | 513 | ||
| 512 | notes: | 514 | notes: |
| 513 | 515 | ||
| 514 | Abort any current command, prevent anything else from being | 516 | Execute a reset on the device as soon as the current IO |
| 515 | queued, execute a reset on the device, and issue BLKRRPART | 517 | operation has completed. |
| 516 | ioctl on the block device. | ||
| 517 | 518 | ||
| 518 | Executes an ATAPI soft reset if applicable, otherwise | 519 | Executes an ATAPI soft reset if applicable, otherwise |
| 519 | executes an ATA soft reset on the controller. | 520 | executes an ATA soft reset on the controller. |