Messages in this thread |  | | | Date | Fri, 2 Mar 2012 08:21:22 +0100 | | From | Sascha Hauer <> | | Subject | Re: [PATCH 1/2] dma: imx-sdma: Let the driver be probed even if no firware is found |
| |
On Wed, Feb 29, 2012 at 11:20:37AM -0300, Fabio Estevam wrote: > 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@freescale.com>
Both patches:
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> --- > 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 > >
-- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
|  |