usb: musb: musb_cppi41: Defer probe only if DMA is not ready

If dma_request_slave_channel() failed to return a channel,
then the driver will print an error and request to defer probe,
regardless of the cause of the failure.
Defer if the DMA is not ready yet otherwise print an error.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index e7c8b1b8bf2296229b2eef3343811e6cbbc9b317..ba255280a624d6922b82d501bf96ce3933359f1d 100644 (file)
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -673,12 +673,15 @@ static int cppi41_dma_controller_start(struct cppi41_dma_controller *controller)
                musb_dma->status = MUSB_DMA_STATUS_FREE;
                musb_dma->max_len = SZ_4M;
 
-               dc = dma_request_slave_channel(dev->parent, str);
-               if (!dc) {
-                       dev_err(dev, "Failed to request %s.\n", str);
-                       ret = -EPROBE_DEFER;
+               dc = dma_request_chan(dev->parent, str);
+               if (IS_ERR(dc)) {
+                       ret = PTR_ERR(dc);
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(dev, "Failed to request %s: %d.\n",
+                                       str, ret);
                        goto err;
                }
+
                cppi41_channel->dc = dc;
        }
        return 0;