diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-14 08:28:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-14 08:28:30 +0100 |
| commit | 555a098af6086256bc64d3806519f37ccae936e0 (patch) | |
| tree | 4f13126483fc1202d23f1ba55045fac41d19118e /drivers/parport | |
| parent | d969135aae1434547f41853f0e8eaa622e8b8816 (diff) | |
| parent | f0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (diff) | |
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/parport/parport_pc.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 70694ce38be2..dc82ef096f3b 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -37,7 +37,7 @@ config PARPORT_PC tristate "PC-style hardware" depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ - !XTENSA && !CRIS && !H8300 + !XTENSA && !CRIS ---help--- You should say Y here if you have a PC-style parallel port. All diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 903e1285fda0..963761526229 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -2004,6 +2004,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, struct resource *ECR_res = NULL; struct resource *EPP_res = NULL; struct platform_device *pdev = NULL; + int ret; if (!dev) { /* We need a physical device to attach to, but none was @@ -2014,8 +2015,11 @@ struct parport *parport_pc_probe_port(unsigned long int base, return NULL; dev = &pdev->dev; - dev->coherent_dma_mask = DMA_BIT_MASK(24); - dev->dma_mask = &dev->coherent_dma_mask; + ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(24)); + if (ret) { + dev_err(dev, "Unable to set coherent dma mask: disabling DMA\n"); + dma = PARPORT_DMA_NONE; + } } ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL); |