diff options
| author |   Sergey Shtylyov <s.shtylyov@omp.ru> | 2022-10-29 00:07:06 +0300 |
|---|---|---|
| committer |   Damien Le Moal <damien.lemoal@opensource.wdc.com> | 2022-10-31 20:27:27 +0900 |
| commit | 171a93182eccd6e6835d2c86b40787f9f832efaa (patch) | |
| tree | c79ba4eb7710156cb9995bf2a3973c0a98149ae3 /drivers/ata | |
| parent | ata: ahci_qoriq: Fix compilation warning (diff) | |
| download | linux-dev-171a93182eccd6e6835d2c86b40787f9f832efaa.tar.xz linux-dev-171a93182eccd6e6835d2c86b40787f9f832efaa.zip | |
ata: pata_legacy: fix pdc20230_set_piomode()
Clang gives a warning when compiling pata_legacy.c with 'make W=1' about
the 'rt' local variable in pdc20230_set_piomode() being set but unused.
Quite obviously, there is an outb() call missing to write back the updated
variable. Moreover, checking the docs by Petr Soucek revealed that bitwise
AND should have been done with a negated timing mask and the master/slave
timing masks were swapped while updating...
Fixes: 669a5db411d8 ("[libata] Add a bunch of PATA drivers.")
Reported-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 0a8bf09a5c19..03c580625c2c 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -315,9 +315,10 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev) outb(inb(0x1F4) & 0x07, 0x1F4); rt = inb(0x1F3); - rt &= 0x07 << (3 * adev->devno); + rt &= ~(0x07 << (3 * !adev->devno)); if (pio) - rt |= (1 + 3 * pio) << (3 * adev->devno); + rt |= (1 + 3 * pio) << (3 * !adev->devno); + outb(rt, 0x1F3); udelay(100); outb(inb(0x1F2) | 0x01, 0x1F2); |