Re: [PATCH 1/2] dma: imx-sdma: Let the driver be probed even if nofirware is found

[Sascha Hauer]

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@xxxxxxxxxxxxx>

Both patches:

Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>


> ---
>  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 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/