diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-10 11:39:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-10 11:39:23 -0700 |
| commit | 4c71842375f52dc8a8a6097ffcd625243e153649 (patch) | |
| tree | b5d9f7b74d206585349c26d1c83c6b3164407042 /drivers/ata/ahci_platform.c | |
| parent | Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| parent | ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command. (diff) | |
| download | linux-dev-4c71842375f52dc8a8a6097ffcd625243e153649.tar.xz linux-dev-4c71842375f52dc8a8a6097ffcd625243e153649.zip | |
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Nothing too interesting. All fixes are ahci_platform related"
* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command.
libahci: export ahci_qc_issue() and ahci_start_fix_rx()
ata: ahci_imx: warn when disabling ahci link
ahci: disable ncq feature for hisilicon sata
ahci: imx: manage only sata_ref_clk in imx_sata_enable[disable]
libahci_platform: Fail when PHY required but PHY support disabled
Diffstat (limited to 'drivers/ata/ahci_platform.c')
| -rw-r--r-- | drivers/ata/ahci_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index ebe505c17763..b10d81ddb528 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -58,7 +58,7 @@ static int ahci_probe(struct platform_device *pdev) } if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) - hflags |= AHCI_HFLAG_NO_FBS; + hflags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, hflags, 0, 0); |