diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 15:51:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 15:51:56 +0200 |
| commit | a19be58c9cfbc95a009e54013e6bc8f38f1ea82a (patch) | |
| tree | a0dff6ec05381785cc7db02f0312ca7645dd8646 /drivers/spi | |
| parent | spi: atmel: Fix incorrect error path (diff) | |
| parent | spi/clps711x: drop clk_put for devm_clk_get in spi_clps711x_probe() (diff) | |
| download | linux-a19be58c9cfbc95a009e54013e6bc8f38f1ea82a.tar.xz linux-a19be58c9cfbc95a009e54013e6bc8f38f1ea82a.zip | |
Merge remote-tracking branch 'spi/fix/clps711x' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-clps711x.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c index 5655acf55bfe..6416798828e7 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c @@ -226,7 +226,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) dev_name(&pdev->dev), hw); if (ret) { dev_err(&pdev->dev, "Can't request IRQ\n"); - clk_put(hw->spi_clk); goto clk_out; } @@ -247,7 +246,6 @@ err_out: gpio_free(hw->chipselect[i]); spi_master_put(master); - kfree(master); return ret; } @@ -263,7 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) gpio_free(hw->chipselect[i]); spi_unregister_master(master); - kfree(master); return 0; } |