[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1330525238-25420-1-git-send-email-festevam@gmail.com>
Date: Wed, 29 Feb 2012 11:20:37 -0300
From: Fabio Estevam <festevam@...il.com>
To: linux-kernel@...r.kernel.org
Cc: dan.j.williams@...el.com, vinod.koul@...el.com,
kernel@...gutronix.de, shawn.guo@...escale.com,
Fabio Estevam <festevam@...il.com>,
Fabio Estevam <fabio.estevam@...escale.com>
Subject: [PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found
On the device tree case the code bails out when the firmware name cannot be found
or if the firmware fails to be requested.
Fix this behaviour as the SDMA engine can still operate with the built-in
ROM scripts.
Signed-off-by: Fabio Estevam <fabio.estevam@...escale.com>
---
drivers/dma/imx-sdma.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index bf736ad..130b994 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1397,15 +1397,12 @@ static int __init sdma_probe(struct platform_device *pdev)
*/
ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
&fw_name);
- if (ret) {
+ if (ret)
dev_err(&pdev->dev, "failed to get firmware name\n");
- goto err_init;
- }
-
- ret = sdma_get_firmware(sdma, fw_name);
- if (ret) {
- dev_err(&pdev->dev, "failed to get firmware\n");
- goto err_init;
+ else {
+ ret = sdma_get_firmware(sdma, fw_name);
+ if (ret)
+ dev_err(&pdev->dev, "failed to get firmware\n");
}
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists