Commit 74ee48a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata fix from Niklas Cassel:

 - Fix an unintentional masking of AHCI ports when the device tree does
   not define port child nodes (Damien)

* tag 'ata-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: libahci_platform: Do not set mask_port_map when not needed
parents 319fc77f 2c202e6c

drivers/ata/libahci_platform.c

+0 −2
Original line number Diff line number Diff line
@@ -651,8 +651,6 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, 
		 * If no sub-node was found, keep this for device tree

		 * compatibility

		 */

		hpriv->mask_port_map |= BIT(0);



		rc = ahci_platform_get_phy(hpriv, 0, dev, dev->of_node);

		if (rc)

			goto err_out;