diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-03 18:25:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-03 18:25:40 +0200 |
| commit | 2b2322d662237a4b635a755df15e21b9ff80716b (patch) | |
| tree | d7ecd68f0158835dabcf650c40dfe3370d91ec98 /drivers/spi/spi-clps711x.c | |
| parent | spi: clps711x: Remove redundant label (diff) | |
| parent | spi/clps711x: drop clk_put for devm_clk_get in spi_clps711x_probe() (diff) | |
| download | linux-2b2322d662237a4b635a755df15e21b9ff80716b.tar.xz linux-2b2322d662237a4b635a755df15e21b9ff80716b.zip | |
Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
Conflicts:
drivers/spi/spi-clps711x.c
Diffstat (limited to 'drivers/spi/spi-clps711x.c')
| -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 1a786834c16d..73b9a461853f 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 err_out; } @@ -246,7 +245,6 @@ err_out: gpio_free(hw->chipselect[i]); spi_master_put(master); - kfree(master); return ret; } @@ -262,7 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) gpio_free(hw->chipselect[i]); spi_unregister_master(master); - kfree(master); return 0; } |