Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kerne...

[mv-sheeva.git] / Documentation / ioctl / hdio.txt

diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt
index c19efdeace2cd220a73554b66f5c0fbef1d81d0b..91a6ecbae0bb9601b7d50e084af1eeb96869f730 100644 (file)
--- a/Documentation/ioctl/hdio.txt
+++ b/Documentation/ioctl/hdio.txt
@@ -508,12 +508,13 @@ HDIO_DRIVE_RESET          execute a device reset
 
        error returns:
          EACCES        Access denied:  requires CAP_SYS_ADMIN
+         ENXIO         No such device: phy dead or ctl_addr == 0
+         EIO           I/O error:      reset timed out or hardware error
 
        notes:
 
-         Abort any current command, prevent anything else from being
-         queued, execute a reset on the device, and issue BLKRRPART
-         ioctl on the block device.
+         Execute a reset on the device as soon as the current IO
+         operation has completed.
 
          Executes an ATAPI soft reset if applicable, otherwise
          executes an ATA soft reset on the controller.