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

Commit 5fdb3247 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers/ide/cy82c693.c: Add missing pci_dev_put
  ide: Fix irq flags madness
parents 140d0b21 0302899e

drivers/ide/cy82c693.c

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) 
		pci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, time_16);

		pci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, time_8);

	}

	if (hwif->index > 0)

		pci_dev_put(dev);

}



static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)

drivers/ide/ide_platform.c

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/ata_platform.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/io.h>



static void __devinit plat_ide_setup_ports(struct ide_hw *hw,
@@ -95,7 +96,10 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) 
	plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start);

	hw.dev = &pdev->dev;



	d.irq_flags = res_irq->flags;

	d.irq_flags = res_irq->flags & IRQF_TRIGGER_MASK;

	if (res_irq->flags & IORESOURCE_IRQ_SHAREABLE)

		d.irq_flags |= IRQF_SHARED;



	if (mmio)

		d.host_flags |= IDE_HFLAG_MMIO;