Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8dc020c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Two libata driver specific fixes for v4.8-rc4.  Nothing too scary"

* 'for-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  pata_ninja32: Avoid corrupting status flags
  ahci: disable correct irq for dummy ports
parents 748e7fc2 9ebae9e4

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, 


		/* Do not receive interrupts sent by dummy ports */

		if (!pp) {

			disable_irq(irq + i);

			disable_irq(irq);

			continue;

		}

drivers/ata/pata_ninja32.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	ap->ioaddr.altstatus_addr = base + 0x1E;

	ap->ioaddr.bmdma_addr = base;

	ata_sff_std_ports(&ap->ioaddr);

	ap->pflags = ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;

	ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;



	ninja32_program(base);

	/* FIXME: Should we disable them at remove ? */