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

Commit 8174a06e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev 

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  libata: fix build without BMDMA
  [libata] ahci_platform: fix DT probing
parents 09521577 aab94404

drivers/ata/ahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int __init ahci_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct ahci_platform_data *pdata = dev_get_platdata(dev);

	const struct platform_device_id *id = platform_get_device_id(pdev);

	struct ata_port_info pi = ahci_port_info[id->driver_data];

	struct ata_port_info pi = ahci_port_info[id ? id->driver_data : 0];

	const struct ata_port_info *ppi[] = { &pi, NULL };

	struct ahci_host_priv *hpriv;

	struct ata_host *host;

drivers/ata/libata-sff.c

+4 −0
Original line number Diff line number Diff line
@@ -2533,10 +2533,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, 
	if (rc)

		goto out;



#ifdef CONFIG_ATA_BMDMA

	if (bmdma)

		/* prepare and activate BMDMA host */

		rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host);

	else

#endif

		/* prepare and activate SFF host */

		rc = ata_pci_sff_prepare_host(pdev, ppi, &host);

	if (rc)
@@ -2544,10 +2546,12 @@ static int ata_pci_init_one(struct pci_dev *pdev, 
	host->private_data = host_priv;

	host->flags |= hflags;



#ifdef CONFIG_ATA_BMDMA

	if (bmdma) {

		pci_set_master(pdev);

		rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);

	} else

#endif

		rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);

out:

	if (rc == 0)