summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Linton <jeremy.linton@arm.com>2015-08-19 16:36:31 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 10:47:13 +0100
commit17f69b5fa6f642898a7dae16dee6997869b1f234 (patch)
tree48c1d50df6f3646a90f70e7e387e1b6de90c1482
parent39047e0702c003d2c4cc1d493d7823407a96e1f5 (diff)
downloadop-kernel-dev-17f69b5fa6f642898a7dae16dee6997869b1f234.zip
op-kernel-dev-17f69b5fa6f642898a7dae16dee6997869b1f234.tar.gz
USB: ehci-platform: Display a DMA configuration error message
If the ehci driver fails to configure the dma settings then display a dev error instead of simply failing. This is triggered in an ACPI world if the user fails to set the _CCA on the device. Tested-by: Huang Shijie <shijie.huang@arm.com> Reviewed-by: Graeme Gregory <graeme.gregory@linaro.org> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ehci-platform.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 5c3c085..d9144d5 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -162,8 +162,10 @@ static int ehci_platform_probe(struct platform_device *dev)
err = dma_coerce_mask_and_coherent(&dev->dev,
pdata->dma_mask_64 ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32));
- if (err)
+ if (err) {
+ dev_err(&dev->dev, "Error: DMA mask configuration failed\n");
return err;
+ }
irq = platform_get_irq(dev, 0);
if (irq < 0) {
OpenPOWER on IntegriCloud