diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-12-18 00:42:09 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 02:40:19 +0400 |
| commit | ea01e8a4cdff627cbc417d1bf945bf34df9afa9d (patch) | |
| tree | 84b7ddb7537a9732b6df665a0718a537b0ee1031 /drivers/spi | |
| parent | 20e9e78f8b0f1ed02a3a095240853b1767482757 (diff) | |
| download | linux-ea01e8a4cdff627cbc417d1bf945bf34df9afa9d.tar.xz | |
spi/bcm63xx: check return value of clk_prepare_enable
Ensure we notice if the clock cannot be enabled for any reason and pass
the error down.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index e20a669c190c..db6a47d7b48c 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -399,7 +399,10 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) } /* Initialize hardware */ - clk_prepare_enable(bs->clk); + ret = clk_prepare_enable(bs->clk); + if (ret) + goto out_err; + bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS); /* register and we are done */ @@ -452,8 +455,11 @@ static int bcm63xx_spi_resume(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); struct bcm63xx_spi *bs = spi_master_get_devdata(master); + int ret; - clk_prepare_enable(bs->clk); + ret = clk_prepare_enable(bs->clk); + if (ret) + return ret; spi_master_resume(master); |