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

Commit 8718d75e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_ixp4xx_cf: fix interrupt
  pata_ixp4xx_cf: fix oops on detach
  libata: kernel-doc fix
  sata_inic162x: kill double region requests
  drivers/ata/Kconfig: PATA_SCC depends on wrong platform
  sata_sil24: Add Adaptec 1220SA PCI ID
  libata: don't whine if ->prereset() returns -ENOENT
parents f32e3555 282c6b9c

drivers/ata/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ config PATA_IXP4XX_CF 


config PATA_SCC

	tristate "Toshiba's Cell Reference Set IDE support"

	depends on PCI && PPC_IBM_CELL_BLADE

	depends on PCI && PPC_CELLEB

	help

	  This option enables support for the built-in IDE controller on

	  Toshiba Cell Reference Board.

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static u64 ata_id_n_sectors(const u16 *id) 
/**

 *	ata_id_to_dma_mode	-	Identify DMA mode from id block

 *	@dev: device to identify

 *	@mode: mode to assume if we cannot tell

 *	@unknown: mode to assume if we cannot tell

 *

 *	Set up the timing values for the device based upon the identify

 *	reported values for the DMA mode. This function is used by drivers

drivers/ata/libata-eh.c

+7 −1
Original line number Diff line number Diff line
@@ -1625,8 +1625,14 @@ static int ata_eh_reset(struct ata_port *ap, int classify, 
		rc = prereset(ap);

		if (rc) {

			if (rc == -ENOENT) {

				ata_port_printk(ap, KERN_DEBUG, "port disabled. ignoring.\n");

				ata_port_printk(ap, KERN_DEBUG,

						"port disabled. ignoring.\n");

				ap->eh_context.i.action &= ~ATA_EH_RESET_MASK;



				for (i = 0; i < ATA_MAX_DEVICES; i++)

					classes[i] = ATA_DEV_NONE;



				rc = 0;

			} else

				ata_port_printk(ap, KERN_ERR,

					"prereset failed (errno=%d)\n", rc);

drivers/ata/pata_ixp4xx_cf.c

+1 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev) 


	irq = platform_get_irq(pdev, 0);

	if (irq)

		set_irq_type(irq, IRQT_HIGH);

		set_irq_type(irq, IRQT_RISING);



	/* Setup expansion bus chip selects */

	*data->cs0_cfg = data->cs0_bits;
@@ -232,7 +232,6 @@ static __devexit int ixp4xx_pata_remove(struct platform_device *dev) 
	struct ata_host *host = platform_get_drvdata(dev);



	ata_host_detach(host);

	platform_set_drvdata(dev, NULL);



	return 0;

}

drivers/ata/sata_inic162x.c

+0 −4
Original line number Diff line number Diff line
@@ -672,10 +672,6 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		return rc;



	rc = pci_request_regions(pdev, DRV_NAME);

	if (rc)

		return rc;



	rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME);

	if (rc)

		return rc;