tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] LBA28/LBA48 off-by-one bug in ata.h
sata_inic162x: enable LED blinking
ata: duplicate variable sparse warning

Linus Torvalds 7c22a3d8 0cb60efd

+4 -3
+1 -1
drivers/ata/ata_piix.c
··· 1499 1499 * off. 1500 1500 */ 1501 1501 if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) { 1502 - int rc = piix_disable_ahci(pdev); 1502 + rc = piix_disable_ahci(pdev); 1503 1503 if (rc) 1504 1504 return rc; 1505 1505 }
+2 -1
drivers/ata/sata_inic162x.c
··· 96 96 PORT_SCR = 0x20, 97 97 98 98 /* HOST_CTL bits */ 99 + HCTL_LEDEN = (1 << 3), /* enable LED operation */ 99 100 HCTL_IRQOFF = (1 << 8), /* global IRQ off */ 100 101 HCTL_FTHD0 = (1 << 10), /* fifo threshold 0 */ 101 102 HCTL_FTHD1 = (1 << 11), /* fifo threshold 1*/ ··· 541 540 void __iomem *port_base = inic_port_base(ap); 542 541 543 542 /* fire up the ADMA engine */ 544 - writew(HCTL_FTHD0, port_base + HOST_CTL); 543 + writew(HCTL_FTHD0 | HCTL_LEDEN, port_base + HOST_CTL); 545 544 writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL); 546 545 writeb(0, port_base + PORT_CPB_PTQFIFO); 547 546
+1 -1
include/linux/ata.h
··· 745 745 static inline int lba_28_ok(u64 block, u32 n_block) 746 746 { 747 747 /* check the ending block number */ 748 - return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256); 748 + return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256); 749 749 } 750 750 751 751 static inline int lba_48_ok(u64 block, u32 n_block)