Merge tag 'ata-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull ata fixes from Damien Le Moal:
"Two driver fixes:

- Fix the PIO mode configuration of the pdc20230 (pata_legacy)
driver. This also removes a compilation warning with clang and W=1
(Sergey)

- Fix devm_platform_ioremap_resource() return value check in the
palmld driver (Yang)"

* tag 'ata-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
ata: palmld: fix return value check in palmld_pata_probe()
ata: pata_legacy: fix pdc20230_set_piomode()

Linus Torvalds 3 years ago ee6050c8 7f7bac08

+5 -4

2 changed files

expand all

drivers

ata

pata_legacy.c

pata_palmld.c

+3 -2

drivers/ata/pata_legacy.c

··· 315 315 outb(inb(0x1F4) & 0x07, 0x1F4); 316 316 317 317 rt = inb(0x1F3); 318 - rt &= 0x07 << (3 * adev->devno); 318 + rt &= ~(0x07 << (3 * !adev->devno)); 319 319 if (pio) 320 - rt |= (1 + 3 * pio) << (3 * adev->devno); 320 + rt |= (1 + 3 * pio) << (3 * !adev->devno); 321 + outb(rt, 0x1F3); 321 322 322 323 udelay(100); 323 324 outb(inb(0x1F2) | 0x01, 0x1F2);

+2 -2

drivers/ata/pata_palmld.c

··· 63 63 64 64 /* remap drive's physical memory address */ 65 65 mem = devm_platform_ioremap_resource(pdev, 0); 66 - if (!mem) 67 - return -ENOMEM; 66 + if (IS_ERR(mem)) 67 + return PTR_ERR(mem); 68 68 69 69 /* request and activate power and reset GPIOs */ 70 70 lda->power = devm_gpiod_get(dev, "power", GPIOD_OUT_HIGH);