diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2012-01-19 19:09:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 10:32:06 -0700 |
| commit | 54aa05c61f9cc429d7e56d1dc7e88ef308d362bd (patch) | |
| tree | f6abbc2026095e589a1cf26c73b2584898e12fc2 /drivers | |
| parent | a9758dd522160885657ea98137b6e8a3205597e6 (diff) | |
| download | lwn-54aa05c61f9cc429d7e56d1dc7e88ef308d362bd.tar.gz lwn-54aa05c61f9cc429d7e56d1dc7e88ef308d362bd.zip | |
pata_legacy: correctly mask recovery field for HT6560B
commit 9716387311c790de381214c03e7f1b72b91a8189 upstream.
According to the HT6560H datasheet, the recovery timing field is 4-bit wide,
with a value of 0 meaning 16 cycles. Correct obvious thinko in the recovery
field mask.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 35aca7d1a3eb..4fe9d2138d48 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -401,8 +401,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev) ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); active = clamp_val(t.active, 2, 15); - recover = clamp_val(t.recover, 2, 16); - recover &= 0x15; + recover = clamp_val(t.recover, 2, 16) & 0x0F; inb(0x3E6); inb(0x3E6); |