diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
| commit | 4f797f56c3786e2c6bc542b3f80e9a599b073976 (patch) | |
| tree | 12f311ac2a06329d58d43437243a9b777c7822f4 /drivers/ata/ahci.c | |
| parent | c5105d764e0214bcc4c6d40d7ba231d01b2e9dda (diff) | |
| parent | 63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 (diff) | |
| download | linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.gz linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.bz2 linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.zip | |
Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ec6c64fce74a..4bfd1b14b390 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -910,7 +910,7 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) * value, don't extend it here. This happens on STA2X11, for example. * * XXX: manipulating the DMA mask from platform code is completely - * bogus, platform code should use dev->bus_dma_mask instead.. + * bogus, platform code should use dev->bus_dma_limit instead.. */ if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32)) return 0; |