Merge remote-tracking branch 'spi/fix/clps711x' into spi-linus

a19be58c · Mark Brown · de8cc234 · 0158026c · a19be58c
Commit a19be58c authored Oct 07, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

drivers/spi/spi-clps711x.c drivers/spi/spi-clps711x.c +0 -3

No files found.
--- 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 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 			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;
 }