|
@@ -1228,18 +1228,16 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
|
|
|
|
|
|
status = spi_register_master(master);
|
|
status = spi_register_master(master);
|
|
if (status < 0)
|
|
if (status < 0)
|
|
- goto err_spi_register;
|
|
|
|
|
|
+ goto disable_pm;
|
|
|
|
|
|
return status;
|
|
return status;
|
|
|
|
|
|
-err_spi_register:
|
|
|
|
- spi_master_put(master);
|
|
|
|
disable_pm:
|
|
disable_pm:
|
|
pm_runtime_disable(&pdev->dev);
|
|
pm_runtime_disable(&pdev->dev);
|
|
dma_chnl_free:
|
|
dma_chnl_free:
|
|
kfree(mcspi->dma_channels);
|
|
kfree(mcspi->dma_channels);
|
|
free_master:
|
|
free_master:
|
|
- kfree(master);
|
|
|
|
|
|
+ spi_master_put(master);
|
|
platform_set_drvdata(pdev, NULL);
|
|
platform_set_drvdata(pdev, NULL);
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|