summaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/ns87415.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2008-07-23 19:55:53 +0200
committerBartlomiej Zolnierkiewicz2008-07-23 19:55:53 +0200
commit92eb43800a3c1300bd5cb8a2a27e6f2a84f7042e (patch)
tree6c4b7253d2e799f260d7858b99addd0cdac978d2 /drivers/ide/pci/ns87415.c
parentide: use ->tf_load in SELECT_DRIVE() (diff)
downloadkernel-qcow2-linux-92eb43800a3c1300bd5cb8a2a27e6f2a84f7042e.tar.gz
kernel-qcow2-linux-92eb43800a3c1300bd5cb8a2a27e6f2a84f7042e.tar.xz
kernel-qcow2-linux-92eb43800a3c1300bd5cb8a2a27e6f2a84f7042e.zip
ide: use ->tf_read in ide_read_error()
* Add IDE_TFLAG_IN_FEATURE taskfile flag for reading Feature register and handle it in ->tf_read. * Convert ide_read_error() to use ->tf_read instead of ->INB, then uninline and export it. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
-rw-r--r--drivers/ide/pci/ns87415.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index b20e5f01ac89..b9bb8428b35e 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -88,6 +88,8 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
/* be sure we're looking at the low order bits */
outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+ if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+ tf->feature = inb(io_ports->feature_addr);
if (task->tf_flags & IDE_TFLAG_IN_NSECT)
tf->nsect = inb(io_ports->nsect_addr);
if (task->tf_flags & IDE_TFLAG_IN_LBAL)